From 0674c2c9fc12499c9ebb1ecf7ae9a5c36b0da8a2 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 1 Mar 2012 15:03:15 +0400 Subject: [PATCH] Sync with portage [Thu Mar 1 15:03:13 MSK 2012]. --- dev-perl/mogilefs-server/Manifest | 1 + .../mogilefs-server-2.590.0.ebuild | 99 ++++ dev-python/python-twitter/Manifest | 1 + .../python-twitter-0.8.2.ebuild | 53 ++ dev-python/virtualenv/Manifest | 1 + .../virtualenv/virtualenv-1.7.1.2.ebuild | 24 + media-libs/libvpx/libvpx-1.0.0.ebuild | 6 +- .../cache/dev-perl/mogilefs-server-2.590.0 | 22 + .../cache/dev-python/python-twitter-0.8.2 | 22 + metadata/cache/dev-python/virtualenv-1.7.1.2 | 22 + metadata/cache/media-libs/libvpx-1.0.0 | 2 +- metadata/cache/sys-apps/portage-2.1.10.48 | 22 - metadata/cache/sys-apps/portage-2.2.0_alpha88 | 22 - .../sys-kernel/{dracut-017 => dracut-017-r1} | 0 metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- profiles/arch/powerpc/use.mask | 4 - sys-apps/portage/Manifest | 1 - sys-apps/portage/portage-2.1.10.48.ebuild | 390 --------------- sys-apps/portage/portage-2.2.0_alpha88.ebuild | 461 ------------------ ...dracut-017.ebuild => dracut-017-r1.ebuild} | 3 +- 25 files changed, 256 insertions(+), 912 deletions(-) create mode 100644 dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild create mode 100644 dev-python/python-twitter/python-twitter-0.8.2.ebuild create mode 100644 dev-python/virtualenv/virtualenv-1.7.1.2.ebuild create mode 100644 metadata/cache/dev-perl/mogilefs-server-2.590.0 create mode 100644 metadata/cache/dev-python/python-twitter-0.8.2 create mode 100644 metadata/cache/dev-python/virtualenv-1.7.1.2 delete mode 100644 metadata/cache/sys-apps/portage-2.1.10.48 delete mode 100644 metadata/cache/sys-apps/portage-2.2.0_alpha88 rename metadata/cache/sys-kernel/{dracut-017 => dracut-017-r1} (100%) delete mode 100644 sys-apps/portage/portage-2.1.10.48.ebuild delete mode 100644 sys-apps/portage/portage-2.2.0_alpha88.ebuild rename sys-kernel/dracut/{dracut-017.ebuild => dracut-017-r1.ebuild} (97%) diff --git a/dev-perl/mogilefs-server/Manifest b/dev-perl/mogilefs-server/Manifest index e49701710601..a3116bf93537 100644 --- a/dev-perl/mogilefs-server/Manifest +++ b/dev-perl/mogilefs-server/Manifest @@ -8,4 +8,5 @@ DIST MogileFS-Server-2.55.tar.gz 278915 RMD160 7a5c95b5adc59b9c7bf4550ce135bec14 DIST MogileFS-Server-2.56.tar.gz 153506 RMD160 9951d3733feb5a11072cfc6d1b6d906f9e5a4c75 SHA1 27bcfcacaf04a1d97e732427367f74b421b16c52 SHA256 58044213f7ee06eaf20e312f085190f89e57fbe57928df1190f661b3c58bb3fe DIST MogileFS-Server-2.57.tar.gz 153876 RMD160 3089f0f8930bf37cd4f09b68ffb6333cfb871478 SHA1 e6838df81b769664488f088fb02a6f239272e649 SHA256 318c5ceece6465fef43613310ab3c84914bea528c58a667ccad01fa31a56bfe5 DIST MogileFS-Server-2.58.tar.gz 155061 RMD160 a46aa3353bc2fda92acfc471f6a7888b204f1b80 SHA1 4b0466d62d945950da2afe81e65385f0ce09cedc SHA256 e93f25bda03fbe8ac57b62a2d60f9f478387343f584c85453e658dcb348460c6 +DIST MogileFS-Server-2.59.tar.gz 155095 RMD160 69f81853542361991ffaf5e9c4b79926eba054d1 SHA1 048cb1accb1889b7b81e0922c7031020286a5ca7 SHA256 edd64d6d5dbb645848bab7c6bdf37fd45f6fd11268560bc8eb5a8bf186848e04 DIST mogilefs-server-2.37.tar.gz 267909 RMD160 a6e25bb945770bb6a1d395620a277b7798c77b39 SHA1 d4b0f4177e6401bab6676725edaad66baea47d3a SHA256 1fcac070057c54599b99c2836b5ff157fd8433a1315363949b2f0d601c114ca6 diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild new file mode 100644 index 000000000000..9732650f7884 --- /dev/null +++ b/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.590.0.ebuild,v 1.1 2012/03/01 08:06:36 robbat2 Exp $ + +EAPI=4 + +MY_PN=MogileFS-Server +MODULE_AUTHOR=DORMANDO +MODULE_VERSION=${PV:0:4} +inherit perl-module + +DESCRIPTION="Server for the MogileFS distributed file system" +HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}" + +IUSE="mysql sqlite postgres" + +SLOT="0" +LICENSE="|| ( Artistic GPL-2 )" +KEYWORDS="~amd64 ~ppc ~x86" + +# Upstream site recommends this, +# but it breaks Perlbal +# dev-perl/Perlbal-XS-HTTPHeaders +RDEPEND="dev-perl/Net-Netmask + >=dev-perl/Danga-Socket-1.61 + >=dev-perl/Sys-Syscall-0.22 + >=dev-perl/Perlbal-1.790 + dev-perl/IO-AIO + dev-perl/libwww-perl + >=dev-perl/MogileFS-Client-1.14 + >=dev-perl/MogileFS-Utils-2.20 + dev-perl/Cache-Memcached + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + sqlite? ( dev-perl/DBD-SQLite )" +DEPEND="${RDEPEND}" + +# You need a local MySQL or Postgresql server for this +#SRC_TEST="do" + +#PATCHES=( ) + +MOGILE_USER="mogile" + +pkg_setup() { + # Warning! It is important that the uid is constant over Gentoo machines + # As mogilefs may be used with non-local block devices that move! + enewuser ${MOGILE_USER} 460 -1 -1 +} + +src_prepare() { + for f in Makefile.PL MANIFEST ; do + if [ -f "${S}"/${f}.orig ]; then + cp -f "${S}"/${f}{.orig,} + else + cp -f "${S}"/${f}{,.orig} + fi + done + # If we are not in a cutting edge Git source, we would prefer to not install + # duplicates of these. + sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL + sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST + mv -f "${S}/lib/mogdeps" "${S}" +} + +src_compile() { + export MOGILE_NO_BUILTIN_DEPS=1 + perl-module_src_compile || die "perl-module_src_compile failed" +} + +src_install() { + export MOGILE_NO_BUILTIN_DEPS=1 + perl-module_src_install || die "perl-module_src_install failed" + cd "${S}" + + newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd + newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd + + newconfd "${FILESDIR}"/mogstored-conf.d-2.30 mogstored + newinitd "${FILESDIR}"/mogstored-init.d-2.50 mogstored + + newinitd "${FILESDIR}"/mogautomount-init.d-2.50 mogautomount + + diropts -m 700 -o ${MOGILE_USER} + keepdir /var/run/mogile + keepdir /var/mogdata + diropts -m 755 -o root + + dodir /etc/mogilefs + insinto /etc/mogilefs + insopts -m 600 -o root -g ${MOGILE_USER} + newins "${FILESDIR}"/mogilefsd.conf-2.30 mogilefsd.conf + newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf +} + +pkg_postinst() { + chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf + chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf +} diff --git a/dev-python/python-twitter/Manifest b/dev-python/python-twitter/Manifest index a5b3f640e5c0..f6e599f17e6b 100644 --- a/dev-python/python-twitter/Manifest +++ b/dev-python/python-twitter/Manifest @@ -1 +1,2 @@ DIST python-twitter-0.8.1.tar.gz 67265 RMD160 f2516e8861641d76e01bbf9126259c61d28178eb SHA1 b9b85da21d60a2528966d076de8b330665072126 SHA256 cf793bdfe5d028f7646f80190a491f150574159ab3a968364b1e18e6e2d38b27 +DIST python-twitter-0.8.2.tar.gz 63648 RMD160 3fff2e9923e26acc2d87369b36b9bcca88ad9f12 SHA1 a119f4da1694bc5396fc27875e538999bbf5d8d2 SHA256 b7fb64877c5d53457a44899f5aa35ae073a1c3587b35f3f2661656e2fff8f72e diff --git a/dev-python/python-twitter/python-twitter-0.8.2.ebuild b/dev-python/python-twitter/python-twitter-0.8.2.ebuild new file mode 100644 index 000000000000..2117bf18231d --- /dev/null +++ b/dev-python/python-twitter/python-twitter-0.8.2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-twitter/python-twitter-0.8.2.ebuild,v 1.1 2012/03/01 09:38:50 djc Exp $ + +EAPI="2" +SUPPORT_PYTHON_ABIS="1" + +inherit distutils + +DESCRIPTION="This library provides a pure python interface for the Twitter API" +HOMEPAGE="http://code.google.com/p/python-twitter/" +SRC_URI="http://python-twitter.googlecode.com/files/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x64-macos" +IUSE="examples" + +RDEPEND="dev-python/oauth2 + dev-python/simplejson" +DEPEND="${RDEPEND} + dev-python/setuptools" +RESTRICT_PYTHON_ABIS="3.*" + +DOCS="CHANGES README" +PYTHON_MODNAME="twitter.py" + +src_prepare() { + distutils_src_prepare + + # Delete internal copy of simplejson. + rm -fr simplejson +} + +#Test are disabled because they are broken. +#See http://code.google.com/p/python-twitter/issues/detail?id=196 for details. +#src_test() { +# testing() { +# PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" twitter_test.py +# } +# python_execute_function testing +#} + +src_install() { + distutils_src_install + + dohtml doc/twitter.html + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/* + fi +} diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest index 17c8bd57d71d..a6e3350f0a2a 100644 --- a/dev-python/virtualenv/Manifest +++ b/dev-python/virtualenv/Manifest @@ -1,3 +1,4 @@ DIST virtualenv-1.6.4.tar.gz 1889033 RMD160 4574406ec1db8d911950e0e0bf865aa7c64183a2 SHA1 eeaae3a84d9076577996a02951afc78b8e947067 SHA256 a68efb4b35a4fef2a57de1981e00d9cf60be5b17d8f677baa0c5848582aaae85 DIST virtualenv-1.7.1.1.tar.gz 2137863 RMD160 c4a2e6cd5e3d2f8e9447bcf48653f06e6b0bf525 SHA1 cd2ac68687ee4e2efe0299b72699aa08d8bc0f27 SHA256 edf6891ba6b24278b3b17faaa7d8a753fc3121e845340e0e8fcc55e783b81e8d +DIST virtualenv-1.7.1.2.tar.gz 2138019 RMD160 5411386ce30e2de5ac5a0ec1689923e18facc27c SHA1 61aa9e69dee3f5e33cb763d06f0faa41ba77a5f1 SHA256 9f23c47e167f127268cf6777caf613280cf066b32c0183581bf79eab5ccc907e DIST virtualenv-1.7.tar.gz 2125413 RMD160 5d5f9a7b82bd4ec659d853a1bbaacaac32961116 SHA1 3c99e759a06470a1838c98b750d5b72972ac82d6 SHA256 e32b851eec3beae048c41dedcbebdae8484752b4426436ba8d7d1d69458ef6fc diff --git a/dev-python/virtualenv/virtualenv-1.7.1.2.ebuild b/dev-python/virtualenv/virtualenv-1.7.1.2.ebuild new file mode 100644 index 000000000000..60787cf33546 --- /dev/null +++ b/dev-python/virtualenv/virtualenv-1.7.1.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.7.1.2.ebuild,v 1.1 2012/03/01 09:26:36 djc Exp $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +DISTUTILS_SRC_TEST="nosetests" + +inherit distutils + +DESCRIPTION="Virtual Python Environment builder" +HOMEPAGE="http://pypi.python.org/pypi/virtualenv" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +SLOT="0" +IUSE="" + +DEPEND="dev-python/setuptools" +RDEPEND="${DEPEND}" + +DOCS="docs/index.txt docs/news.txt" +PYTHON_MODNAME="virtualenv.py virtualenv_support" diff --git a/media-libs/libvpx/libvpx-1.0.0.ebuild b/media-libs/libvpx/libvpx-1.0.0.ebuild index be6e0ba958cf..62096ea0b6ce 100644 --- a/media-libs/libvpx/libvpx-1.0.0.ebuild +++ b/media-libs/libvpx/libvpx-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.0.0.ebuild,v 1.2 2012/02/29 13:49:42 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.0.0.ebuild,v 1.3 2012/03/01 09:20:48 xarthisius Exp $ EAPI=4 inherit multilib toolchain-funcs @@ -11,10 +11,10 @@ if [[ ${PV} == *9999* ]]; then KEYWORDS="" elif [[ ${PV} == *pre* ]]; then SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~ia64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" else SRC_URI="http://webm.googlecode.com/files/${PN}-v${PV}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~ia64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}-v${PV}" fi diff --git a/metadata/cache/dev-perl/mogilefs-server-2.590.0 b/metadata/cache/dev-perl/mogilefs-server-2.590.0 new file mode 100644 index 000000000000..a66f74bf3fad --- /dev/null +++ b/metadata/cache/dev-perl/mogilefs-server-2.590.0 @@ -0,0 +1,22 @@ +dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall-0.22 >=dev-perl/Perlbal-1.790 dev-perl/IO-AIO dev-perl/libwww-perl >=dev-perl/MogileFS-Client-1.14 >=dev-perl/MogileFS-Utils-2.20 dev-perl/Cache-Memcached mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-lang/perl[-build] +dev-perl/Net-Netmask >=dev-perl/Danga-Socket-1.61 >=dev-perl/Sys-Syscall-0.22 >=dev-perl/Perlbal-1.790 dev-perl/IO-AIO dev-perl/libwww-perl >=dev-perl/MogileFS-Client-1.14 >=dev-perl/MogileFS-Utils-2.20 dev-perl/Cache-Memcached mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-lang/perl[-build] +0 +mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.59.tar.gz + +http://www.danga.com/mogilefs/ http://search.cpan.org/dist/MogileFS-Server/ +|| ( Artistic GPL-2 ) +Server for the MogileFS distributed file system +~amd64 ~ppc ~x86 +base eutils multilib perl-module toolchain-funcs user +mysql sqlite postgres + + + +4 + +compile configure install postinst prepare setup test unpack + + + + + diff --git a/metadata/cache/dev-python/python-twitter-0.8.2 b/metadata/cache/dev-python/python-twitter-0.8.2 new file mode 100644 index 000000000000..e64e5ff75c39 --- /dev/null +++ b/metadata/cache/dev-python/python-twitter-0.8.2 @@ -0,0 +1,22 @@ +dev-python/oauth2 dev-python/simplejson dev-python/setuptools >=app-admin/eselect-python-20091230 dev-lang/python +dev-python/oauth2 dev-python/simplejson >=app-admin/eselect-python-20091230 dev-lang/python +0 +http://python-twitter.googlecode.com/files/python-twitter-0.8.2.tar.gz + +http://code.google.com/p/python-twitter/ +Apache-2.0 +This library provides a pure python interface for the Twitter API +~amd64 ~x86 ~x64-macos +distutils multilib python toolchain-funcs +examples + + + +2 + +compile install postinst postrm prepare + + + + + diff --git a/metadata/cache/dev-python/virtualenv-1.7.1.2 b/metadata/cache/dev-python/virtualenv-1.7.1.2 new file mode 100644 index 000000000000..a8a23ff27691 --- /dev/null +++ b/metadata/cache/dev-python/virtualenv-1.7.1.2 @@ -0,0 +1,22 @@ +dev-python/setuptools >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose ) +dev-python/setuptools >=app-admin/eselect-python-20091230 dev-lang/python +0 +mirror://pypi/v/virtualenv/virtualenv-1.7.1.2.tar.gz + +http://pypi.python.org/pypi/virtualenv +MIT +Virtual Python Environment builder +~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris +distutils multilib python toolchain-funcs +test + + + +3 + +compile install postinst postrm prepare test + + + + + diff --git a/metadata/cache/media-libs/libvpx-1.0.0 b/metadata/cache/media-libs/libvpx-1.0.0 index e0d173712d0d..c789f5e6f97b 100644 --- a/metadata/cache/media-libs/libvpx-1.0.0 +++ b/metadata/cache/media-libs/libvpx-1.0.0 @@ -6,7 +6,7 @@ http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2 http://www.webmproject.org BSD WebM VP8 Codec SDK -~alpha amd64 ~arm ~ia64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux +~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux multilib toolchain-funcs altivec debug doc mmx postproc sse sse2 sse3 ssse3 sse4_1 static-libs +threads sse2? ( mmx ) diff --git a/metadata/cache/sys-apps/portage-2.1.10.48 b/metadata/cache/sys-apps/portage-2.1.10.48 deleted file mode 100644 index a23ab031db22..000000000000 --- a/metadata/cache/sys-apps/portage-2.1.10.48 +++ /dev/null @@ -1,22 +0,0 @@ -python3? ( =dev-lang/python-3* ) !pypy1_8? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) ) 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 ) >=app-admin/eselect-python-20091230 -python3? ( =dev-lang/python-3* ) !pypy1_8? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) ) 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 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] =app-admin/eselect-python-20091230 -0 -mirror://gentoo/portage-2.1.10.48.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.10.48.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) - -http://www.gentoo.org/proj/en/portage/index.xml -GPL-2 -Portage is the package management and distribution system for Gentoo -~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd -eutils multilib python toolchain-funcs user -build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr - -!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) ) - -2 - -compile install postinst postrm preinst prepare setup test - - - - - diff --git a/metadata/cache/sys-apps/portage-2.2.0_alpha88 b/metadata/cache/sys-apps/portage-2.2.0_alpha88 deleted file mode 100644 index ec1ee704c7f6..000000000000 --- a/metadata/cache/sys-apps/portage-2.2.0_alpha88 +++ /dev/null @@ -1,22 +0,0 @@ -python3? ( =dev-lang/python-3* ) !pypy1_8? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) ) 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 ) >=app-admin/eselect-python-20091230 -python3? ( =dev-lang/python-3* ) !pypy1_8? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) ) 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 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] =app-admin/eselect-python-20091230 -0 -mirror://gentoo/portage-2.2.0_alpha88.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha88.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) - -http://www.gentoo.org/proj/en/portage/index.xml -GPL-2 -Portage is the package management and distribution system for Gentoo -~sparc-fbsd ~x86-fbsd -eutils multilib python toolchain-funcs user -build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr - -!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) ) - -3 - -compile install postinst postrm preinst prepare setup test - - - - - diff --git a/metadata/cache/sys-kernel/dracut-017 b/metadata/cache/sys-kernel/dracut-017-r1 similarity index 100% rename from metadata/cache/sys-kernel/dracut-017 rename to metadata/cache/sys-kernel/dracut-017-r1 diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 327fb07e90f4..71024b732b85 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Thu, 01 Mar 2012 08:06:46 +0000 +Thu, 01 Mar 2012 10:06:46 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 327fb07e90f4..bb521b5de19d 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Thu, 01 Mar 2012 08:06:46 +0000 +Thu, 01 Mar 2012 10:06:47 +0000 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 26f6303fbb76..f2b489883cae 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Thu, 01 Mar 2012 08:06:48 +0000 +Thu, 01 Mar 2012 10:06:48 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 4cd814975c7e..423c65388815 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Thu Mar 1 08:06:46 UTC 2012 +Thu Mar 1 10:06:46 UTC 2012 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 84411e3a7c3f..823630b902e4 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Thu, 01 Mar 2012 08:30:01 +0000 +Thu, 01 Mar 2012 10:30:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index cd65c026ff03..8df35d785544 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1330589101 Thu Mar 1 08:05:01 2012 UTC +1330596301 Thu Mar 1 10:05:01 2012 UTC diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask index 9beb4f042b20..8f6b99ad2388 100644 --- a/profiles/arch/powerpc/use.mask +++ b/profiles/arch/powerpc/use.mask @@ -6,10 +6,6 @@ # Unmask the Altivec instruction set -altivec -# vpx is not supported by non x86 archs yet -vpx - - # Incompatible Use Flags # # These use-flags are x86/amd64 only, please feel free to make a bug report if diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 9cd366702720..1f4747cfcb06 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,5 +1,4 @@ DIST portage-2.1.10.44.tar.bz2 781681 RMD160 b26cd8102620f966eefb2bf5214080d6ce0d8fc1 SHA1 1e1417d1b534fedb4e6ae749fc807c7ba8088a44 SHA256 688494c4b76189550e1a437835f8276f2047992ed6c617f62b01e459f8fbdf04 -DIST portage-2.1.10.48.tar.bz2 802429 RMD160 42adaaa40543b30cc5f5a3ed5456a43a13223775 SHA1 877f2acbace5da1a8fdc9f5a0f8ba1c45b6c84da SHA256 97bb403dfb95f880d82d257f7834f8656b670684aece933c1da3285ad8d32137 DIST portage-2.1.10.49.tar.bz2 803941 RMD160 088a21151b66c7fdb4ed39c46b25fee1b4ecce9e SHA1 11322e216b6d6a2f753f45a150c3f618e4bf0c45 SHA256 b50cdbb4ececba27cddfe24d63517c73a32b905bcf3b7d55b692f6661247590e DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 diff --git a/sys-apps/portage/portage-2.1.10.48.ebuild b/sys-apps/portage/portage-2.1.10.48.ebuild deleted file mode 100644 index f355c0a47993..000000000000 --- a/sys-apps/portage/portage-2.1.10.48.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.48.ebuild,v 1.2 2012/02/21 06:49:27 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -SLOT="0" -IUSE="build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr" - -# Import of the io module in python-2.6 raises ImportError for the -# thread module if threading is disabled. -python_dep="python3? ( =dev-lang/python-3* ) - !pypy1_8? ( !python2? ( !python3? ( - || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) - ) ) ) - pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) ) - 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. -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's -# quite slow, so it's not considered in the dependencies as an alternative to -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so -# for now, don't pull in xattr deps for other kernels. -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 - xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) - selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] = 0x2060000 and "good" or "bad")') = good ]] -} - -current_python_has_xattr() { - [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \ - /usr/bin/python -c 'import xattr' 2>/dev/null -} - -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 pypy1_8 && use python3 ; then - ewarn "Both pypy1_8 and python3 USE flags are enabled, but only one" - ewarn "can be in the shebangs. Using python3." - fi - if use pypy1_8 && use python2 ; then - ewarn "Both pypy1_8 and python2 USE flags are enabled, but only one" - ewarn "can be in the shebangs. Using python2" - fi - if ! use pypy1_8 && ! 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 - elif use pypy1_8; then - python_set_active_version 2.7-pypy-1.8 - 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 xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - 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 . - elif use pypy1_8; then - einfo "Converting shebangs for pypy-c1.8..." - python_convert_shebangs -r 2.7-pypy-1.8 . - 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 - ./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" - 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 - if use userland_GNU; then - rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" - 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 ! -path "pym/portage/tests*") ; 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 - - # We install some minimal tests for use as a preinst sanity check. - # These tests must be able to run without a full source tree and - # without relying on a previous portage instance being installed. - cd "$S" || die "cd failed" - exeinto $portage_base/pym/portage/tests || die - doexe pym/portage/tests/runTests || die - insinto $portage_base/pym/portage/tests || die - doins pym/portage/tests/*.py || die - insinto $portage_base/pym/portage/tests/lint || die - doins pym/portage/tests/lint/*.py || die - doins pym/portage/tests/lint/__test__ || die - - # 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 - - 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}"/{ChangeLog,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 - emerge-webrsync - 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 [[ $ROOT == / ]] ; then - # Run some minimal tests as a sanity check. - local test_runner=$(find "$D" -name runTests) - if [[ -n $test_runner && -x $test_runner ]] ; then - einfo "Running preinst sanity tests..." - "$test_runner" || die "preinst sanity tests failed" - fi - fi - - if use xattr && ! current_python_has_xattr ; then - ewarn "For optimal performance in xattr handling, install" - ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and" - ewarn "enable USE=python3 for $CATEGORY/$PN." - fi - - 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 - - if [[ -d ${ROOT}var/log/portage && \ - $(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \ - has_version '= 0x2060000 and "good" or "bad")') = good ]] -} - -current_python_has_xattr() { - [[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \ - "${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null -} - -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 pypy1_8 && use python3 ; then - ewarn "Both pypy1_8 and python3 USE flags are enabled, but only one" - ewarn "can be in the shebangs. Using python3." - fi - if use pypy1_8 && use python2 ; then - ewarn "Both pypy1_8 and python2 USE flags are enabled, but only one" - ewarn "can be in the shebangs. Using python2" - fi - if ! use pypy1_8 && ! 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 - elif use pypy1_8; then - python_set_active_version 2.7-pypy-1.8 - 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 xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - 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 . - elif use pypy1_8; then - einfo "Converting shebangs for pypy-c1.8..." - python_convert_shebangs -r 2.7-pypy-1.8 . - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ - -i pym/portage/const.py || \ - die "Failed to patch portage.const.EPREFIX" - - einfo "Prefixing shebangs ..." - find . -type f -print0 | \ - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ - die "sed failed" - fi - done - - einfo "Adjusting make.globals ..." - sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \ - -e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \ - -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \ - -i cnf/make.globals || die "sed failed" - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - 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 - ./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 - if use userland_GNU; then - rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper" - 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 "$ED$portage_base/$x" || die "cp failed" - fi - done - - cd "$S" || die "cd failed" - for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; 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 "$ED$portage_base/$x" || die "cp failed" - fi - done - - # We install some minimal tests for use as a preinst sanity check. - # These tests must be able to run without a full source tree and - # without relying on a previous portage instance being installed. - cd "$S" || die "cd failed" - exeinto $portage_base/pym/portage/tests || die - doexe pym/portage/tests/runTests || die - insinto $portage_base/pym/portage/tests || die - doins pym/portage/tests/*.py || die - insinto $portage_base/pym/portage/tests/lint || die - doins pym/portage/tests/lint/*.py || die - doins pym/portage/tests/lint/__test__ || die - - # Symlinks to directories cause up/downgrade issues and the use of these - # modules outside of portage is probably negligible. - for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do - [ ! -L "${x}" ] && continue - die "symlink to directory will cause upgrade/downgrade issues: '${x}'" - done - - 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}"/{ChangeLog,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 - emerge-webrsync - 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 [[ $ROOT == / ]] ; then - # Run some minimal tests as a sanity check. - local test_runner=$(find "$ED" -name runTests) - if [[ -n $test_runner && -x $test_runner ]] ; then - einfo "Running preinst sanity tests..." - "$test_runner" || die "preinst sanity tests failed" - fi - fi - - if use xattr && ! current_python_has_xattr ; then - ewarn "For optimal performance in xattr handling, install" - ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and" - ewarn "enable USE=python3 for $CATEGORY/$PN." - fi - - 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 "${EROOT}/etc/make.globals" ]; then - rm "${EROOT}/etc/make.globals" - fi - - has_version "<${CATEGORY}/${PN}-2.2_alpha" \ - && MINOR_UPGRADE=true || MINOR_UPGRADE=false - - has_version "<=${CATEGORY}/${PN}-2.2_pre5" \ - && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false - - # 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 "${EROOT}"var/lib/portage/preserved_libs_registry ] && \ - has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \ - && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false - - [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \ - && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false -} - -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 ; then - einfo "moving set references from the worldfile into world_sets" - cd "${EROOT}/var/lib/portage/" - grep "^@" world >> world_sets - sed -i -e '/^@/d' world - fi - - if $NEEDED_REBUILD_UPGRADE ; then - einfo "rebuilding NEEDED.ELF.2 files" - for cpv in "${EROOT}/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 ; 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 - - if $MINOR_UPGRADE ; 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 -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/portage/pym -} diff --git a/sys-kernel/dracut/dracut-017.ebuild b/sys-kernel/dracut/dracut-017-r1.ebuild similarity index 97% rename from sys-kernel/dracut/dracut-017.ebuild rename to sys-kernel/dracut/dracut-017-r1.ebuild index a0f0d4b74659..0afdf4c565e6 100644 --- a/sys-kernel/dracut/dracut-017.ebuild +++ b/sys-kernel/dracut/dracut-017-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-017.ebuild,v 1.1 2012/02/29 18:13:20 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-017-r1.ebuild,v 1.1 2012/03/01 08:40:44 aidecoe Exp $ EAPI=4 @@ -161,7 +161,6 @@ src_install() { emake WITH_SWITCH_ROOT=0 \ prefix=/usr sysconfdir=/etc DESTDIR="${D}" \ install - dosym usr/lib/dracut/dracut-functions dracut-functions.sh local gen2conf