Sync with portage [Thu Feb 6 12:13:25 MSK 2014].

mhiretskiy
root 10 years ago
parent 314d8cc565
commit 93d03e559c

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.ebuild,v 1.2 2014/01/18 04:38:15 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.ebuild,v 1.3 2014/02/05 11:07:32 jer Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed

@ -0,0 +1 @@
DIST bloscpack-0.5.0.tar.gz 45171 SHA256 9889ad1a79434de8adb49ad6a12c40ac542850e0a133ed1376cdbec27462f7f8 SHA512 3a3ab351e9ab77409b8f5774c4ede533e2393bf49065d52cb60018268f448d1cef5ba2b24d0d25ec86298f6ff55bbb9075af3b302558a0e2e7343344b002b8d1 WHIRLPOOL 1700d778fdc21f5b247d5ac97ea58e15511014cdbab666fb2691d483de9cbbe2c1aee5dc59bdb3a42c3859330b236ca817e62dbc81848a22e894fbb40d472afd

@ -0,0 +1,24 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/bloscpack/bloscpack-0.5.0.ebuild,v 1.1 2014/02/06 01:30:04 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1
DESCRIPTION="Command line interface for Blosc compression"
HOMEPAGE="https://github.com/Blosc/bloscpack"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
dev-python/blosc[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci</herd>
<longdescription lang='en'>
Command line interface to and serialization format for Blosc, a high
performance, multi-threaded, blocking and shuffling compressor. Uses
python-blosc bindings to interface with blosc.
</longdescription>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.1 2013/10/13 12:13:49 ryao Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.2 2014/02/06 00:26:47 bicatali Exp $
EAPI=5
@ -14,7 +14,7 @@ if [ ${PV} == "9999" ] ; then
ESVN_PROJECT="lz4-read-only"
else
SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Extremely Fast Compression algorithm"

@ -10,3 +10,7 @@ DIST Csound5.19_manual-fr_html.zip 10125804 SHA256 f11bfaeb286ff0dedf1008bf2d775
DIST Csound5.19_manual-fr_pdf.zip 6264056 SHA256 602be471db59d3b3e6042807e29c5c3fc1762123745b7668628a18dc02beeaff SHA512 8c7a9531534eb407ebbe8b4f4f1b7765d3fe2b4d66828c4de86c3b5b6fba7af6c68bbcfed00d4908ee92994f85e141b4b8bad909321c6bb2c70311bc06217fc3 WHIRLPOOL c6f007c91a4c2d2aa9984c3b7cb298854ff6bb78650722837614c4284c8e1232a484786196afbc0bac256d1c3390c99755e411d46f69b6646208ba3583e4f224
DIST Csound5.19_manual_html.zip 9860517 SHA256 ba198155bee31cfe27e54ba313453bf100af8f22cc57b7dbcd4edbfe8fb99af5 SHA512 e01ca0e6bac13d7a466d6d93634a870b8dd29ad9b827c8c3ef3fe59ebc942eb32aed2d8cf75a8560debf85c01f7cd94c08e7285c0def8e8aa50f0fb11a443792 WHIRLPOOL d6816455f96b1d3a455647a61756a6d2bcf1575f6c0179f1730ad73fe147e1f5975f469f47464d3f4ba1aa5ff8c70d4b1015807a55f35e4b3458b8cd27c07a3f
DIST Csound5.19_manual_pdf.zip 5955401 SHA256 2000d817b6d608e8dc537f66412c676240fef604c8c5b3fdbf39bfcb1f7621a6 SHA512 936d4d08ea4610f84d304e9c6dde4eb1aadcd78d3c7a3a1eb64c6a36f6e51ca883fcc6a6ef40a2da13783b6fad81afc85810d242496b367602d49d4fb8ff129c WHIRLPOOL 46da9ac899332bffa399440120c21a0aecbbc72bd13e4dece45589bdc58146bd4053c77f964d203f90d93a3907c7352c52fa34571762b530ee5ed1471a8e9915
DIST Csound6.01_manual-fr_html.zip 10190112 SHA256 e10f15bc3035654e08a7e756ae95db5c6841d82e97fae5807379937e07a4d98f SHA512 2203cfdd802e2250cda850b2cc22e4442c14c2555a75aae95c05e9dc31eb327bc613a3ca9c9227152eaa629054488668a5fc195b7239f8282b3942c709af447e WHIRLPOOL 85322b06fc37cdc76781badeb9b9907302c6072c635562454b2a6e3a17e5562f5ac6a00a83f5c5485261aa51a1fdadd6e4761e9aac77e8bef70c96a094f5d0a2
DIST Csound6.01_manual-fr_pdf.zip 6344735 SHA256 ac71275c933002c99ca5a241203749d06d3efb662cfc6e281b4a8b6bfa8a4f55 SHA512 624d7bf48815e94326f05b2cb832e36389f8684c36fe7ea645c38ad2d1f95afa9cf82deb0a9067abce32e56072ecc631e0826218375fb9c3c1a3145a522ba752 WHIRLPOOL 06753a9154b93cb2932225967add3442212d0df2dbe4ce527f9987a04c1ccf78a9ee3fccea00bc96371370003821c5eefeabe851e394b0fe8e3ae327eca0dae5
DIST Csound6.01_manual_html.zip 9922699 SHA256 7b9e0d99eebfe92d5e1d76c4c852c7403c3d71bf88920ae0c3696233e970257a SHA512 8eeb3acff75155c6c762f574caf6c6b8d616b2e65e895d81235f443e3aa426e036c51880ca66781226e064b1d837296d92e50e6da4e78e0afce63114b5b4f206 WHIRLPOOL d89ee5c7880a5196e0d873fd990298da2d7f0b59d19cdd61c8c829b17408f8c8d933cb21875edb65c3900e995c8b52bab01a84a7f7c9d951fa2d563a35fce739
DIST Csound6.01_manual_pdf.zip 6023506 SHA256 bf82b5707e8ec8430f4b696905de5e0c359de822b44662f8db068929873636d5 SHA512 8d73261db0c816dc6507adab5ba08a22760128af968a525b5e443a78be16e71251bb28909563f18437be60da44e91ffc810b9348d861376f3c038fec2889d8cf WHIRLPOOL db2da90b5ec0bebe8adc68e020cc82b9e1bc8045a6fdb44941cde43ef9243353435c6f75f8b0d5f99e18f04ca38b9e9cc4ee97d2a56da20b72a6ebc14f074334

@ -0,0 +1,64 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-doc/csound-manual/csound-manual-6.01.ebuild,v 1.1 2014/02/05 11:28:14 radhermit Exp $
EAPI=5
MY_P=Csound${PV}
DESCRIPTION="The Csound reference manual"
HOMEPAGE="http://csounds.com/"
SRC_URI="
mirror://sourceforge/csound/${MY_P}_manual_pdf.zip
linguas_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_pdf.zip )
html? (
mirror://sourceforge/csound/${MY_P}_manual_html.zip
linguas_fr? ( mirror://sourceforge/csound/${MY_P}_manual-fr_html.zip )
)"
LICENSE="FDL-1.3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="html"
LANGS=" fr"
IUSE+="${LANGS// / linguas_}"
DEPEND="app-arch/unzip"
S=${WORKDIR}
src_unpack() {
unpack ${MY_P}_manual_pdf.zip
if use html ; then
unpack ${MY_P}_manual_html.zip
mv html html-en
fi
local lang
for lang in ${LANGS} ; do
use linguas_${lang} || continue
unpack ${MY_P}_manual-${lang}_pdf.zip
if use html ; then
unpack ${MY_P}_manual-${lang}_html.zip
mv html html-${lang}
fi
done
}
src_install() {
dodoc *.pdf
if use html ; then
dohtml -r html-en/*
local lang
for lang in ${LANGS} ; do
use linguas_${lang} || continue
docinto html-${lang}
dohtml -r html-${lang}/*
done
fi
}

@ -3,4 +3,5 @@ DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a
DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
DIST vim-patches-7.4.169.patch.bz2 220499 SHA256 faf5e06098d45b25cea6ddb9e4ef080ce4717f2c2148678ded4f715bcb9fd652 SHA512 1102d7f89ad0cdd81f4bfa03875d400be3b642565527c61e72583b85723ef5f25ed7d7bc0dd6b620d013f65f500add84b96db734f45c21369e22405f6f6a6f8d WHIRLPOOL 1e45b776f85c941b3b741018338ece2b299576e5261103bc381e9b1f1162652bd79f119e060710dbabf99e3bff0668de9485df38b57897f716bd52a2f1f3cb2f
DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0

@ -0,0 +1,397 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.169.ebuild,v 1.1 2014/02/06 07:10:44 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
PYTHON_REQ_USE=threads
inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-single-r1
if [[ ${PV} == 9999* ]] ; then
inherit mercurial
EHG_REPO_URI="https://vim.googlecode.com/hg/"
EHG_PROJECT="vim"
else
VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
fi
DESCRIPTION="GUI version of the Vim text editor"
HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
luajit? ( lua )
"
RDEPEND="
~app-editors/vim-core-${PV}
>=app-admin/eselect-vi-1.1
>=sys-libs/ncurses-5.2-r2
x11-libs/libXext
x11-libs/libXt
acl? ( kernel_linux? ( sys-apps/acl ) )
!aqua? (
gtk? (
>=x11-libs/gtk+-2.6:2
x11-libs/libXft
gnome? ( >=gnome-base/libgnomeui-2.6 )
)
!gtk? (
motif? ( >=x11-libs/motif-2.3:0 )
!motif? (
neXt? ( x11-libs/neXtaw )
!neXt? ( x11-libs/libXaw )
)
)
)
cscope? ( dev-util/cscope )
lua? (
luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua[deprecated] )
)
nls? ( virtual/libintl )
perl? ( dev-lang/perl )
python? ( ${PYTHON_DEPS} )
racket? ( dev-scheme/racket )
ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
selinux? ( sys-libs/libselinux )
session? ( x11-libs/libSM )
tcl? ( dev-lang/tcl )
"
DEPEND="${RDEPEND}
>=app-admin/eselect-vi-1.1
dev-util/ctags
sys-devel/autoconf
virtual/pkgconfig
nls? ( sys-devel/gettext )
"
S=${WORKDIR}/vim${VIM_VERSION/.}
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
export LC_COLLATE="C"
# Gnome sandbox silliness. bug #114475.
mkdir -p "${T}"/home
export HOME="${T}"/home
use python && python-single-r1_pkg_setup
}
src_prepare() {
if [[ ${PV} != 9999* ]] ; then
if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
# Apply any patches available from vim.org for this version
epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
fi
fi
# Fixup a script to use awk instead of nawk
sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
|| die "mve.awk sed failed"
# Read vimrc and gvimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
# Hopefully this pattern won't break for a while at least.
# This fixes bug 29398 (27 Sep 2003 agriffis)
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
"${S}"/runtime/doc/syntax.txt \
"${S}"/runtime/doc/tagsrch.txt \
"${S}"/runtime/doc/usr_29.txt \
"${S}"/runtime/menu.vim \
"${S}"/src/configure.in || die 'sed failed'
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
# this is NeXT, but it's actually just a file in dev-libs/9libs
# This fixes bug 43885 (20 Mar 2004 agriffis)
sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
# correctly. To avoid some really entertaining error messages about stuff
# which isn't even in the source file being invalid, we'll do some trickery
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
# Try to avoid sandbox problems. Bug #114475.
if [[ -d "${S}"/src/po ]] ; then
sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
"${S}"/src/po/Makefile
fi
if version_is_at_least 7.3.122 ; then
cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
fi
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
if version_is_at_least 7.3 ; then
sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
fi
}
src_configure() {
local myconf
# Fix bug 37354: Disallow -funroll-all-loops on amd64
# Bug 57859 suggests that we want to do this for all archs
filter-flags -funroll-all-loops
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
# everyone since previous flag filtering bugs have turned out to affect
# multiple archs...
replace-flags -O3 -O2
# Fix bug 18245: Prevent "make" from the following chain:
# (1) Notice configure.in is newer than auto/configure
# (2) Rebuild auto/configure
# (3) Notice auto/configure is newer than auto/config.mk
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
rm -f src/auto/configure
emake -j1 -C src autoconf
# This should fix a sandbox violation (see bug 24447). The hvc
# things are for ppc64, see bug 86433.
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
[[ -e ${file} ]] && addwrite $file
done
use debug && append-flags "-DDEBUG"
myconf="--with-features=huge --disable-gpm --enable-multibyte"
myconf+=" $(use_enable acl)"
myconf+=" $(use_enable cscope)"
myconf+=" $(use_enable lua luainterp)"
myconf+=" $(use_with luajit)"
myconf+=" $(use_enable netbeans)"
myconf+=" $(use_enable nls)"
myconf+=" $(use_enable perl perlinterp)"
myconf+=" $(use_enable racket mzschemeinterp)"
myconf+=" $(use_enable ruby rubyinterp)"
myconf+=" $(use_enable selinux)"
myconf+=" $(use_enable session xsmp)"
myconf+=" $(use_enable tcl tclinterp)"
if use python ; then
if [[ ${EPYTHON} == python3* ]] ; then
myconf+=" --enable-python3interp"
export vi_cv_path_python3="${PYTHON}"
else
myconf+=" --enable-pythoninterp"
export vi_cv_path_python="${PYTHON}"
fi
else
myconf+=" --disable-pythoninterp --disable-python3interp"
fi
# --with-features=huge forces on cscope even if we --disable it. We need
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
if ! use cscope ; then
sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
die "couldn't disable cscope"
fi
# gvim's GUI preference order is as follows:
# aqua CARBON (not tested)
# -aqua gtk gnome GNOME2
# -aqua gtk -gnome GTK2
# -aqua -gtk motif MOTIF
# -aqua -gtk -motif neXt NEXTAW
# -aqua -gtk -motif -neXt ATHENA
echo ; echo
if use aqua ; then
einfo "Building gvim with the Carbon GUI"
myconf+=" --enable-darwin --enable-gui=carbon"
elif use gtk ; then
myconf+=" --enable-gtk2-check"
if use gnome ; then
einfo "Building gvim with the Gnome 2 GUI"
myconf+=" --enable-gui=gnome2"
else
einfo "Building gvim with the gtk+-2 GUI"
myconf+=" --enable-gui=gtk2"
fi
elif use motif ; then
einfo "Building gvim with the MOTIF GUI"
myconf+=" --enable-gui=motif"
elif use neXt ; then
einfo "Building gvim with the neXtaw GUI"
myconf+=" --enable-gui=nextaw"
else
einfo "Building gvim with the Athena GUI"
myconf+=" --enable-gui=athena"
fi
echo ; echo
# Let Portage do the stripping. Some people like that.
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
# Keep Gentoo Prefix env contained within the EPREFIX
use prefix && myconf+=" --without-local-dir"
if [[ ${CHOST} == *-interix* ]]; then
# avoid finding of this function, to avoid having to patch either
# configure or the source, which would be much more hackish.
# after all vim does it right, only interix is badly broken (again)
export ac_cv_func_sigaction=no
fi
econf \
--with-modified-by=Gentoo-${PVR} \
--with-vim-name=gvim --with-x \
${myconf}
}
src_compile() {
# The following allows emake to be used
emake -j1 -C src auto/osdef.h objects
emake
}
src_test() {
echo
einfo "Starting vim tests. Several error messages will be shown"
einfo "while the tests run. This is normal behaviour and does not"
einfo "indicate a fault."
echo
ewarn "If the tests fail, your terminal may be left in a strange"
ewarn "state. Usually, running 'reset' will fix this."
echo
# Don't let vim talk to X
unset DISPLAY
# We've got to call make test from within testdir, since the Makefiles
# don't pass through our VIMPROG argument
cd "${S}"/src/testdir
# Test 49 won't work inside a portage environment
einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
sed -i 's~test49.out~~g' Makefile
# We don't want to rebuild vim before running the tests
sed -i 's,: \$(VIMPROG),: ,' Makefile
# Make gvim not try to connect to X. See :help gui-x11-start
# in vim for how this evil trickery works.
ln -s "${S}"/src/gvim "${S}"/src/testvim
# Don't try to do the additional GUI test
emake -j1 VIMPROG=../testvim nongui
}
# Make convenience symlinks, hopefully without stepping on toes. Some
# of these links are "owned" by the vim ebuild when it is installed,
# but they might be good for gvim as well (see bug 45828)
update_vim_symlinks() {
has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
local f syms
syms="vimdiff rvim rview"
einfo "Calling eselect vi update..."
# Call this with --if-unset to respect user's choice (bug 187449)
eselect vi update --if-unset
# Make or remove convenience symlink, vim -> gvim
if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
rm "${EROOT}"/usr/bin/vim
fi
# Make or remove convenience symlinks to vim
if [[ -f "${EROOT}"/usr/bin/vim ]]; then
for f in ${syms}; do
ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
done
else
for f in ${syms}; do
if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
rm -f "${EROOT}"/usr/bin/${f}
fi
done
fi
# This will still break if you merge then remove the vi package,
# but there's only so much you can do, eh? Unfortunately we don't
# have triggers like are done in rpm-land.
}
src_install() {
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
dobin src/gvim
dosym gvim /usr/bin/gvimdiff
dosym gvim /usr/bin/evim
dosym gvim /usr/bin/eview
dosym gvim /usr/bin/gview
dosym gvim /usr/bin/rgvim
dosym gvim /usr/bin/rgview
dodir /usr/share/man/man1
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
insinto /etc/vim
newins "${FILESDIR}"/gvimrc-r1 gvimrc
eprefixify "${ED}"/etc/vim/gvimrc
newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
doicon "${FILESDIR}"/gvim.xpm
# bash completion script, bug #79018.
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
# We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi
rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
}
pkg_postinst() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
# Update fdo mime stuff, bug #78394
fdo-mime_mime_database_update
if [[ -z ${REPLACING_VERSIONS} ]] ; then
echo
elog "Vim 7 includes an integrated spell checker. You need to install"
elog "word list files before you can use it. There are ebuilds for"
elog "some of these named app-vim/vim-spell-*. If your language of"
elog "choice is not included, please consult vim-spell.eclass for"
elog "instructions on how to make a package."
echo
ewarn "Note that the English word lists are no longer installed by"
ewarn "default."
echo
fi
# Make convenience symlinks
update_vim_symlinks
}
pkg_postrm() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
# Update fdo mime stuff, bug #78394
fdo-mime_mime_database_update
# Make convenience symlinks
update_vim_symlinks
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.13 2013/12/23 10:59:13 hasufell Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.14 2014/02/06 07:10:44 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
@ -26,9 +26,13 @@ HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
luajit? ( lua )
"
RDEPEND="~app-editors/vim-core-${PV}
RDEPEND="
~app-editors/vim-core-${PV}
>=app-admin/eselect-vi-1.1
>=sys-libs/ncurses-5.2-r2
x11-libs/libXext
@ -51,22 +55,24 @@ RDEPEND="~app-editors/vim-core-${PV}
cscope? ( dev-util/cscope )
lua? (
luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua )
!luajit? ( dev-lang/lua[deprecated] )
)
nls? ( virtual/libintl )
perl? ( dev-lang/perl )
python? ( ${PYTHON_DEPS} )
racket? ( dev-scheme/racket )
ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
selinux? ( sys-libs/libselinux )
session? ( x11-libs/libSM )
tcl? ( dev-lang/tcl )"
tcl? ( dev-lang/tcl )
"
DEPEND="${RDEPEND}
>=app-admin/eselect-vi-1.1
dev-util/ctags
sys-devel/autoconf
virtual/pkgconfig
nls? ( sys-devel/gettext )"
nls? ( sys-devel/gettext )
"
S=${WORKDIR}/vim${VIM_VERSION/.}

@ -1,4 +1,2 @@
DIST scite333.tgz 1992362 SHA256 ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3 SHA512 d1bfcf9b83ccd5423c47169f33880b25736931a9a42e543cccd1101fd915ea3b14a51aa74c0879d908f4bb69852059c89f6fdb621731ec43afb6b96b564a7ac3 WHIRLPOOL 390d9d157d8f802ea05db41668115e61cbdb0f47ee81daa85fbbba87d322b527cc33f20af3381db72ce4d9d1eefc7e54188f15397ec5404347ef0a3b45780c8e
DIST scite334.tgz 2017827 SHA256 47107d9f063a0f1928add39c8b82d2d1745228bfd25c313f98f19dbabf75c04b SHA512 a4b67607e9f883e13409c1b96dcf250f4836cd97106f6d73ac07d41ace09473ef78687c82463661229d917a327140b5e1f4f43eb5d8cdb2b3ff94316deb95019 WHIRLPOOL 366348d777262a3cc770846411433bb9418841f5edc3caf19b307eaee54f7d18aeab5dedcb234f087bd360ecd68f55156fc59408548f8ae25ecaf8c18171ece8
DIST scite335.tgz 2099170 SHA256 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 SHA512 a8a976e58e8190d46162a6ef0834403702460c703bc5904fff95610a40014ed024307d6c0ae727e9bb71868fc4ef339878595e879fcfdec4076ea4e656d6b584 WHIRLPOOL fdd89b02fed78feb50e3ae885a8b918541d949625cee88318db7c066f3ad8f288ee8ae87c627d9eed8217a4a5628acd2ddd56b5421a2ac3b848999a148bae4bd
DIST scite336.tgz 2125559 SHA256 9f3f9c9867e93af37af7a59e962aad76897c9e816c683c03e922baed6be506a5 SHA512 da4869fee62e606d44579ffba736b2944c8425e741b6499776aa258275ab5a0def28e0672a7d36da083a39f6acff464158af1e13d197a769c53d90ac5c016312 WHIRLPOOL 3172ba4916c7071d9d83337d779275c5d413450b91a13c6d081c757e504e8e9ff7fe0d3887ae20245c9669404ef9bc19eb0e659cd5f6fb464ce0e2e10a299be8
DIST scite339.tgz 2229269 SHA256 cd7bdfdf8cd870893375519405510417145ec0a9790ed7209f21d552d36c0775 SHA512 f64c044c62123c57f18de2e5e27733827118a442818ffc071d44f5a0cf191e7192c73c3cb3d872678b8fb2f1ed03f7f391d02583c2bb79b0cb6ebf0e2efa5824 WHIRLPOOL 30fc86dd1b6db97b83981adaf29c0e008fb84091891fd0b88d79456e1ff3753c5fe28d075561b08ebf3f306081cbeda6832065c48c934e71ff1cea26efc10bca

@ -1,87 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.3.ebuild,v 1.4 2013/07/02 10:59:26 ago Exp $
EAPI="4"
inherit toolchain-funcs eutils
MY_PV=${PV//./}
DESCRIPTION="A very powerful editor for programmers"
HOMEPAGE="http://www.scintilla.org/SciTE.html"
SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
LICENSE="HPND lua? ( MIT )"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="lua"
RDEPEND="dev-libs/glib
x11-libs/cairo
x11-libs/gtk+:2
x11-libs/gdk-pixbuf
x11-libs/pango
lua? ( >=dev-lang/lua-5 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-apps/sed-4"
S="${WORKDIR}/${PN}/gtk"
src_prepare() {
cd "${WORKDIR}/scintilla/gtk"
sed -i makefile \
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-e "s#-Os##" \
|| die "error patching makefile"
cd "${WORKDIR}/scite/gtk"
sed -i makefile \
-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
|| die "error patching makefile"
cd "${S}"
sed -i makefile \
-e 's#usr/local#usr#g' \
-e 's#/gnome/apps/Applications#/applications#' \
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-e 's#${D}##' \
-e 's#-g root#-g 0#' \
-e "s#-Os##" \
|| die "error patching makefile"
cd "${WORKDIR}"
epatch "${FILESDIR}/${PN}-3.0.1-no-lua.patch"
}
src_compile() {
emake -C ../../scintilla/gtk AR="$(tc-getAR)"
if use lua; then
emake
else
emake NO_LUA=1
fi
}
src_install() {
dodir /usr/bin
dodir /usr/share/{pixmaps,applications}
emake prefix="${ED}/usr" install
# we have to keep this because otherwise it'll break upgrading
mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
dosym /usr/bin/scite /usr/bin/SciTE
# replace .desktop file with our own working version
rm -f "${ED}/usr/share/applications/SciTE.desktop"
domenu "${FILESDIR}/scite.desktop"
doman ../doc/scite.1
dodoc ../README
}

@ -1,87 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.6.ebuild,v 1.1 2013/10/25 12:55:30 ago Exp $
EAPI="4"
inherit toolchain-funcs eutils
MY_PV=${PV//./}
DESCRIPTION="A very powerful editor for programmers"
HOMEPAGE="http://www.scintilla.org/SciTE.html"
SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
LICENSE="HPND lua? ( MIT )"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="lua"
RDEPEND="dev-libs/glib
x11-libs/cairo
x11-libs/gtk+:2
x11-libs/gdk-pixbuf
x11-libs/pango
lua? ( >=dev-lang/lua-5 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-apps/sed-4"
S="${WORKDIR}/${PN}/gtk"
src_prepare() {
cd "${WORKDIR}/scintilla/gtk"
sed -i makefile \
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-e "s#-Os##" \
|| die "error patching makefile"
cd "${WORKDIR}/scite/gtk"
sed -i makefile \
-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
|| die "error patching makefile"
cd "${S}"
sed -i makefile \
-e 's#usr/local#usr#g' \
-e 's#/gnome/apps/Applications#/applications#' \
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-e 's#${D}##' \
-e 's#-g root#-g 0#' \
-e "s#-Os##" \
|| die "error patching makefile"
cd "${WORKDIR}"
epatch "${FILESDIR}/${PN}-3.0.1-no-lua.patch"
}
src_compile() {
emake -C ../../scintilla/gtk AR="$(tc-getAR)"
if use lua; then
emake
else
emake NO_LUA=1
fi
}
src_install() {
dodir /usr/bin
dodir /usr/share/{pixmaps,applications}
emake prefix="${ED}/usr" install
# we have to keep this because otherwise it'll break upgrading
mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
dosym /usr/bin/scite /usr/bin/SciTE
# replace .desktop file with our own working version
rm -f "${ED}/usr/share/applications/SciTE.desktop"
domenu "${FILESDIR}/scite.desktop"
doman ../doc/scite.1
dodoc ../README
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.4.ebuild,v 1.1 2013/07/22 13:11:25 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.9.ebuild,v 1.1 2014/02/06 05:56:29 ago Exp $
EAPI="4"

@ -2,7 +2,9 @@ DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b681
DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
DIST vim-core-7.3-gentoo-patches-r2.tar.bz2 3063 SHA256 cba8a43aea20457b9177be978ac875155288e6e83f05a3193f5dd381d56ec3c4 SHA512 0f4c12057dec787e10d38c3581181b7fe28f032fbc131674a37904afe196938b2e2de8611ee49c9f817cbf9ece5a537edb048a82442aad01500f6e2ad2617968 WHIRLPOOL 0c3cdf536b2ad9d1470fd78f5256b198470e864d05125c67a70e0de873cf2df353769750e7f41c8db0fb56a12a38ea7aa02e27278c1d216b7419cb213618baa6
DIST vim-core-7.3-gentoo-patches-r3.tar.bz2 3379 SHA256 2e0b38221b69d13c43cafb8c71f5be322785b12168278541a6006378c722e650 SHA512 7bebe548d1f65309f022bd459eb10364300cef9363298bf492c960730865b30b789392b123803fd3c3a5a3fb8543b9a83535c593b587a3e1f00290e9d2295714 WHIRLPOOL e75285549df9f4a9fa49cac19f0592ff4e5c87a07075dedd59f4806a104147bd9259de3e714b81b6d91bbbec9613c5f8dc3308649c8a38914cf29db22d539ac1
DIST vim-core-7.3-gentoo-patches-r4.tar.bz2 3015 SHA256 a4f61e4d0cd1848812f603e7f6b8a5304d13ac199f4e3061264cd3bec75a17c5 SHA512 0ba7a20dfdc2c24a92a4af5a6fe49a94d5d5c5e9111c42c4812d0cd52c26cc567acd2d7e74f66730afd3c4bc9f1667b0ad9c1f82f93d2844d8309b143f293676 WHIRLPOOL cec628c0f19971077677e667cc8903ea0a56041799a43907d47acc218fd9e0a6ea2a2a30999c74512fb36d233c6ac6d436f033684290155ff6ae70be5277bdbf
DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
DIST vim-patches-7.4.169.patch.bz2 220499 SHA256 faf5e06098d45b25cea6ddb9e4ef080ce4717f2c2148678ded4f715bcb9fd652 SHA512 1102d7f89ad0cdd81f4bfa03875d400be3b642565527c61e72583b85723ef5f25ed7d7bc0dd6b620d013f65f500add84b96db734f45c21369e22405f6f6a6f8d WHIRLPOOL 1e45b776f85c941b3b741018338ece2b299576e5261103bc381e9b1f1162652bd79f119e060710dbabf99e3bff0668de9485df38b57897f716bd52a2f1f3cb2f
DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0

@ -0,0 +1,230 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.169.ebuild,v 1.1 2014/02/06 07:00:46 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
if [[ ${PV} == 9999* ]] ; then
inherit mercurial
EHG_REPO_URI="https://vim.googlecode.com/hg/"
EHG_PROJECT="vim"
else
VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r4.tar.bz2
http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
IUSE="nls acl minimal"
DEPEND="sys-devel/autoconf"
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
S=${WORKDIR}/vim${VIM_VERSION/.}
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
export LC_COLLATE="C"
# Gnome sandbox silliness. bug #114475.
mkdir -p "${T}"/home
export HOME="${T}"/home
}
src_prepare() {
if [[ ${PV} != 9999* ]] ; then
if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
# Apply any patches available from vim.org for this version
epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
fi
if [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
# Patches for vim-core only (runtime/*)
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/gentoo/patches-core/
fi
fi
# Fixup a script to use awk instead of nawk
sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
|| die "mve.awk sed failed"
# Read vimrc and gvimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
# Hopefully this pattern won't break for a while at least.
# This fixes bug 29398 (27 Sep 2003 agriffis)
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
"${S}"/runtime/doc/syntax.txt \
"${S}"/runtime/doc/tagsrch.txt \
"${S}"/runtime/doc/usr_29.txt \
"${S}"/runtime/menu.vim \
"${S}"/src/configure.in || die 'sed failed'
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
# this is NeXT, but it's actually just a file in dev-libs/9libs
# This fixes bug 43885 (20 Mar 2004 agriffis)
sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
# correctly. To avoid some really entertaining error messages about stuff
# which isn't even in the source file being invalid, we'll do some trickery
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
# Try to avoid sandbox problems. Bug #114475.
if [[ -d "${S}"/src/po ]] ; then
sed -i -e \
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
"${S}"/src/po/Makefile
fi
if version_is_at_least 7.3.122 ; then
cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
fi
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
if version_is_at_least 7.3 ; then
sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
fi
}
src_configure() {
local myconf
# Fix bug 37354: Disallow -funroll-all-loops on amd64
# Bug 57859 suggests that we want to do this for all archs
filter-flags -funroll-all-loops
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
# everyone since previous flag filtering bugs have turned out to affect
# multiple archs...
replace-flags -O3 -O2
# Fix bug 18245: Prevent "make" from the following chain:
# (1) Notice configure.in is newer than auto/configure
# (2) Rebuild auto/configure
# (3) Notice auto/configure is newer than auto/config.mk
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
rm -f src/auto/configure
emake -j1 -C src autoconf
# This should fix a sandbox violation (see bug 24447). The hvc
# things are for ppc64, see bug 86433.
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
[[ -e ${file} ]] && addwrite $file
done
# Let Portage do the stripping. Some people like that.
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
# Keep Gentoo Prefix env contained within the EPREFIX
use prefix && myconf+=" --without-local-dir"
econf \
--with-modified-by=Gentoo-${PVR} \
--with-features=tiny \
--enable-gui=no \
--without-x \
--disable-darwin \
--disable-perlinterp \
--disable-pythoninterp \
--disable-rubyinterp \
--disable-gpm \
--disable-selinux \
$(use_enable nls) \
$(use_enable acl) \
${myconf}
}
src_compile() {
# The following allows emake to be used
emake -j1 -C src auto/osdef.h objects
emake tools
}
src_test() { :; }
src_install() {
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
dodir /usr/{bin,share/{man/man1,vim}}
cd src || die "cd src failed"
emake \
installruntime \
installmanlinks \
installmacros \
installtutor \
installtutorbin \
installtools \
install-languages \
install-icons \
DESTDIR="${D}" \
BINDIR="${EPREFIX}"/usr/bin \
MANDIR="${EPREFIX}"/usr/share/man \
DATADIR="${EPREFIX}"/usr/share
keepdir ${vimfiles}/keymap
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
newins "${FILESDIR}"/vimrc-r4 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal ; then
# To save space, install only a subset of the files.
# Helps minimalize the livecd, bug 65144.
eshopts_push -s extglob
rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
rm "${ED}"/usr/bin/vimtutor
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
# tinkering with the next line might make bad things happen ...
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
eshopts_pop
fi
# These files might have slight security issues, so we won't
# install them. See bug #77841. We don't mind if these don't
# exist.
rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
newbashcomp "${FILESDIR}"/xxd-completion xxd
# We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi
rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
}
pkg_postinst() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
}
pkg_postrm() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
}

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.6 2014/01/23 10:30:29 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.7 2014/02/06 07:00:46 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
@ -14,7 +14,7 @@ else
VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r3.tar.bz2
http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r4.tar.bz2
http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi

@ -3,4 +3,5 @@ DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a
DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
DIST vim-patches-7.4.169.patch.bz2 220499 SHA256 faf5e06098d45b25cea6ddb9e4ef080ce4717f2c2148678ded4f715bcb9fd652 SHA512 1102d7f89ad0cdd81f4bfa03875d400be3b642565527c61e72583b85723ef5f25ed7d7bc0dd6b620d013f65f500add84b96db734f45c21369e22405f6f6a6f8d WHIRLPOOL 1e45b776f85c941b3b741018338ece2b299576e5261103bc381e9b1f1162652bd79f119e060710dbabf99e3bff0668de9485df38b57897f716bd52a2f1f3cb2f
DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0

@ -0,0 +1,368 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.169.ebuild,v 1.1 2014/02/06 07:06:07 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
PYTHON_REQ_USE=threads
inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
if [[ ${PV} == 9999* ]] ; then
inherit mercurial
EHG_REPO_URI="https://vim.googlecode.com/hg/"
EHG_PROJECT="vim"
else
VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
luajit? ( lua )
"
RDEPEND="
>=app-admin/eselect-vi-1.1
>=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )
acl? ( kernel_linux? ( sys-apps/acl ) )
cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 )
lua? (
luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua[deprecated] )
)
!minimal? (
~app-editors/vim-core-${PV}
dev-util/ctags
)
perl? ( dev-lang/perl )
python? ( ${PYTHON_DEPS} )
racket? ( dev-scheme/racket )
ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
selinux? ( sys-libs/libselinux )
tcl? ( dev-lang/tcl )
X? ( x11-libs/libXt )
"
DEPEND="${RDEPEND}
>=app-admin/eselect-vi-1.1
sys-devel/autoconf
>=sys-libs/ncurses-5.2-r2
nls? ( sys-devel/gettext )
"
S=${WORKDIR}/vim${VIM_VERSION/.}
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
export LC_COLLATE="C"
# Gnome sandbox silliness. bug #114475.
mkdir -p "${T}"/home
export HOME="${T}"/home
use python && python-single-r1_pkg_setup
}
src_prepare() {
if [[ ${PV} != 9999* ]] ; then
if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
# Apply any patches available from vim.org for this version
epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
fi
fi
# Fixup a script to use awk instead of nawk
sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
|| die "mve.awk sed failed"
# Read vimrc and gvimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
# Hopefully this pattern won't break for a while at least.
# This fixes bug 29398 (27 Sep 2003 agriffis)
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
"${S}"/runtime/doc/syntax.txt \
"${S}"/runtime/doc/tagsrch.txt \
"${S}"/runtime/doc/usr_29.txt \
"${S}"/runtime/menu.vim \
"${S}"/src/configure.in || die 'sed failed'
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
# this is NeXT, but it's actually just a file in dev-libs/9libs
# This fixes bug 43885 (20 Mar 2004 agriffis)
sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
# correctly. To avoid some really entertaining error messages about stuff
# which isn't even in the source file being invalid, we'll do some trickery
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
# conditionally make the manpager.sh script
if use vim-pager ; then
cat <<-END > "${S}"/runtime/macros/manpager.sh
#!/bin/sh
sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
vim \\
-c 'let no_plugin_maps = 1' \\
-c 'set nolist nomod ft=man' \\
-c 'let g:showmarks_enable=0' \\
-c 'runtime! macros/less.vim' -
END
fi
# Try to avoid sandbox problems. Bug #114475.
if [[ -d "${S}"/src/po ]] ; then
sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
"${S}"/src/po/Makefile
fi
if version_is_at_least 7.3.122 ; then
cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
fi
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
if version_is_at_least 7.3 ; then
sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
fi
}
src_configure() {
local myconf
# Fix bug 37354: Disallow -funroll-all-loops on amd64
# Bug 57859 suggests that we want to do this for all archs
filter-flags -funroll-all-loops
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
# everyone since previous flag filtering bugs have turned out to affect
# multiple archs...
replace-flags -O3 -O2
# Fix bug 18245: Prevent "make" from the following chain:
# (1) Notice configure.in is newer than auto/configure
# (2) Rebuild auto/configure
# (3) Notice auto/configure is newer than auto/config.mk
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
rm -f src/auto/configure
emake -j1 -C src autoconf
# This should fix a sandbox violation (see bug 24447). The hvc
# things are for ppc64, see bug 86433.
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
[[ -e ${file} ]] && addwrite $file
done
if use minimal ; then
myconf="--with-features=tiny \
--disable-nls \
--disable-multibyte \
--disable-acl \
--enable-gui=no \
--without-x \
--disable-darwin \
--disable-luainterp \
--disable-perlinterp \
--disable-pythoninterp \
--disable-mzschemeinterp \
--disable-rubyinterp \
--disable-selinux \
--disable-tclinterp \
--disable-gpm"
else
use debug && append-flags "-DDEBUG"
myconf="--with-features=huge --enable-multibyte"
myconf+=" $(use_enable acl)"
myconf+=" $(use_enable cscope)"
myconf+=" $(use_enable gpm)"
myconf+=" $(use_enable lua luainterp)"
myconf+=" $(use_with luajit)"
myconf+=" $(use_enable nls)"
myconf+=" $(use_enable perl perlinterp)"
myconf+=" $(use_enable racket mzschemeinterp)"
myconf+=" $(use_enable ruby rubyinterp)"
myconf+=" $(use_enable selinux)"
myconf+=" $(use_enable tcl tclinterp)"
if use python ; then
if [[ ${EPYTHON} == python3* ]] ; then
myconf+=" --enable-python3interp"
export vi_cv_path_python3="${PYTHON}"
else
myconf+=" --enable-pythoninterp"
export vi_cv_path_python="${PYTHON}"
fi
else
myconf+=" --disable-pythoninterp --disable-python3interp"
fi
# --with-features=huge forces on cscope even if we --disable it. We need
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
if ! use cscope ; then
sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
die "couldn't disable cscope"
fi
# don't test USE=X here ... see bug #19115
# but need to provide a way to link against X ... see bug #20093
myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
fi
# Let Portage do the stripping. Some people like that.
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
# Keep Gentoo Prefix env contained within the EPREFIX
use prefix && myconf+=" --without-local-dir"
econf \
--with-modified-by=Gentoo-${PVR} \
${myconf}
}
src_compile() {
# The following allows emake to be used
emake -j1 -C src auto/osdef.h objects
emake
}
src_test() {
echo
einfo "Starting vim tests. Several error messages will be shown"
einfo "while the tests run. This is normal behaviour and does not"
einfo "indicate a fault."
echo
ewarn "If the tests fail, your terminal may be left in a strange"
ewarn "state. Usually, running 'reset' will fix this."
echo
# Don't let vim talk to X
unset DISPLAY
# We've got to call make test from within testdir, since the Makefiles
# don't pass through our VIMPROG argument
cd "${S}"/src/testdir
# Test 49 won't work inside a portage environment
einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
sed -i 's~test49.out~~g' Makefile
# We don't want to rebuild vim before running the tests
sed -i 's,: \$(VIMPROG),: ,' Makefile
# Don't try to do the additional GUI test
emake -j1 VIMPROG=../vim nongui
}
# Make convenience symlinks, hopefully without stepping on toes. Some
# of these links are "owned" by the vim ebuild when it is installed,
# but they might be good for gvim as well (see bug 45828)
update_vim_symlinks() {
has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
local f syms
syms="vimdiff rvim rview"
einfo "Calling eselect vi update..."
# Call this with --if-unset to respect user's choice (bug 187449)
eselect vi update --if-unset
# Make or remove convenience symlink, vim -> gvim
if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
rm "${EROOT}"/usr/bin/vim
fi
# Make or remove convenience symlinks to vim
if [[ -f "${EROOT}"/usr/bin/vim ]]; then
for f in ${syms}; do
ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
done
else
for f in ${syms}; do
if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
rm -f "${EROOT}"/usr/bin/${f}
fi
done
fi
# This will still break if you merge then remove the vi package,
# but there's only so much you can do, eh? Unfortunately we don't
# have triggers like are done in rpm-land.
}
src_install() {
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
# managed by eselect-vi
dobin src/vim
dosym vim /usr/bin/vimdiff
dosym vim /usr/bin/rvim
dosym vim /usr/bin/rview
if use vim-pager ; then
dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
insinto ${vimfiles}/macros
doins runtime/macros/manpager.sh
fperms a+x ${vimfiles}/macros/manpager.sh
fi
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
# We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi
rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
}
pkg_postinst() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
if [[ -z ${REPLACING_VERSIONS} ]] ; then
if use X ; then
echo
elog "The 'X' USE flag enables vim <-> X communication, like"
elog "updating the xterm titlebar. It does not install a GUI."
fi
echo
elog "To install a GUI version of vim, use the app-editors/gvim"
elog "package."
echo
elog "Vim 7 includes an integrated spell checker. You need to install"
elog "word list files before you can use it. There are ebuilds for"
elog "some of these named app-vim/vim-spell-*. If your language of"
elog "choice is not included, please consult vim-spell.eclass for"
elog "instructions on how to make a package."
echo
ewarn "Note that the English word lists are no longer installed by"
ewarn "default."
fi
# Make convenience symlinks
update_vim_symlinks
}
pkg_postrm() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
# Make convenience symlinks
update_vim_symlinks
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.9 2013/12/16 09:57:57 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.10 2014/02/06 07:06:07 radhermit Exp $
EAPI=5
VIM_VERSION="7.4"
@ -26,9 +26,13 @@ HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
luajit? ( lua )
"
RDEPEND=">=app-admin/eselect-vi-1.1
RDEPEND="
>=app-admin/eselect-vi-1.1
>=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )
acl? ( kernel_linux? ( sys-apps/acl ) )
@ -36,7 +40,7 @@ RDEPEND=">=app-admin/eselect-vi-1.1
gpm? ( >=sys-libs/gpm-1.19.3 )
lua? (
luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua )
!luajit? ( dev-lang/lua[deprecated] )
)
!minimal? (
~app-editors/vim-core-${PV}
@ -45,15 +49,17 @@ RDEPEND=">=app-admin/eselect-vi-1.1
perl? ( dev-lang/perl )
python? ( ${PYTHON_DEPS} )
racket? ( dev-scheme/racket )
ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
selinux? ( sys-libs/libselinux )
tcl? ( dev-lang/tcl )
X? ( x11-libs/libXt )"
X? ( x11-libs/libXt )
"
DEPEND="${RDEPEND}
>=app-admin/eselect-vi-1.1
sys-devel/autoconf
>=sys-libs/ncurses-5.2-r2
nls? ( sys-devel/gettext )"
nls? ( sys-devel/gettext )
"
S=${WORKDIR}/vim${VIM_VERSION/.}

@ -4,3 +4,4 @@ DIST docker-0.7.3.zip 2659554 SHA256 216a469acd2f11d1c0bf1a2ca07272e6f4614970bb4
DIST docker-0.7.4.zip 2667244 SHA256 e087473ca83e0c7ce435333a4faacc53626cb64476818c5f9582d2ee54e67477 SHA512 d83acd96d4013c70f49bdd5206268a641fab75d558f5be10fd6eccf2f27797f66870b207edc3a1fb9dbe11a89eed8b4463f98ba87e31f0e638ac86b5685ce93e WHIRLPOOL 332a47ee73e2ad4ff8b0ebac5f63d08f594d56efdd1c77846883308b2188af5da775a7ed5786e1669803e7f509703a4a86e879cb7176fc27f0a03df324ceb94c
DIST docker-0.7.5.zip 2668999 SHA256 845ebee1f2f15fe076d5058f137a994d2054f315c4dbd1220df9a58a78075fb7 SHA512 01c4f8f8b9e0290e8834b00c4327ee959c54337a1b130074902aef23556495ae0abcfb88b1b7ca4ed76236b301779b992fb93a264bae3b5d6acd9f08c7257dd5 WHIRLPOOL 178588c3f98c89702bfa847b72efe2f27ba6eaebeb1fdfef2c831b24277d172d133dbe1f4b210e1051383c0a4fd30cd52139c03e9756c091d104f1eb5e1d6974
DIST docker-0.7.6.zip 2669399 SHA256 d9ec6e598dcf75528bf5bfdfd341498a54b8d0748707a0cd6cea0cbe3683fac9 SHA512 8787e7180fb3d4841c9b12ed27c0eac6dbfd777260f51d9b130582952e314835dd177debce354cf49f264b305817fd249411a751ea7ab0bb02eaaff2e6a5984c WHIRLPOOL bb30164d13087b4375011ad569c09087fe7fa493b228087631b52f1a55d4b77e28af75777629f99c1c0e4e8e07f65a3ece123d3ca86e19fa5eef2d90ed03813d
DIST docker-0.8.0.zip 2742779 SHA256 826a72a2b676bf2e5dea731c35c51c6f2e6e3d5ac7cc111aad3bfd86ca41651b SHA512 e761cf57ac9bc42a9575695083ccbf92ea4360e1efead014a14d4257bbb242d4b1ec26d85f9d12988624893362ddfb09ad7a6c7de23a476659923b923768d2e1 WHIRLPOOL 124e04216c9f09f289d6215ba27c9af7f850d47b694dda058a69ad463cf40e8a1ead469acd1894bda0f331557bfe125087bad70a784b8578de90bea2e044653a

@ -0,0 +1,187 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-0.8.0.ebuild,v 1.1 2014/02/05 22:27:43 gregkh Exp $
EAPI=5
DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level."
HOMEPAGE="http://www.docker.io/"
GITHUB_URI="github.com/dotcloud/docker"
if [[ ${PV} == *9999 ]]; then
SRC_URI=""
EGIT_REPO_URI="git://${GITHUB_URI}.git"
inherit git-2
KEYWORDS=""
else
SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip"
DOCKER_GITCOMMIT="cc3a8c8"
KEYWORDS="~amd64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
fi
inherit bash-completion-r1 linux-info systemd udev user
LICENSE="Apache-2.0"
SLOT="0"
IUSE="aufs btrfs +device-mapper doc vim-syntax zsh-completion"
# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper
CDEPEND="
>=dev-db/sqlite-3.7.9:3
sys-fs/lvm2[thin]
"
DEPEND="
${CDEPEND}
>=dev-lang/go-1.2
>=sys-fs/btrfs-progs-0.20
dev-vcs/git
dev-vcs/mercurial
doc? (
dev-python/sphinx
dev-python/sphinxcontrib-httpdomain
)
"
RDEPEND="
${CDEPEND}
!app-emulation/docker-bin
>=sys-apps/iproute2-3.5
>=net-firewall/iptables-1.4
>=app-emulation/lxc-0.8
>=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9
aufs? (
|| (
sys-fs/aufs3
sys-kernel/aufs-sources
)
)
"
RESTRICT="strip"
pkg_setup() {
CONFIG_CHECK+="
~BRIDGE
~IP_NF_TARGET_MASQUERADE
~MEMCG_SWAP
~NETFILTER_XT_MATCH_ADDRTYPE
~NETFILTER_XT_MATCH_CONNTRACK
~NF_NAT
~NF_NAT_NEEDED
"
ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers"
if use aufs; then
CONFIG_CHECK+="
~AUFS_FS
"
ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used"
fi
if use btrfs; then
CONFIG_CHECK+="
~BTRFS_FS
"
fi
if use device-mapper; then
CONFIG_CHECK+="
~BLK_DEV_DM
~DM_THIN_PROVISIONING
~EXT4_FS
"
fi
check_extra_config
}
src_compile() {
# eventually, perhaps Gentoo will include a "go" eclass to do some of this
export GOPATH="${WORKDIR}/gopath"
mkdir -p "$GOPATH" || die
# make sure docker itself is in our shiny new GOPATH
mkdir -p "${GOPATH}/src/$(dirname "$GITHUB_URI")" || die
ln -sf "$(pwd -P)" "${GOPATH}/src/${GITHUB_URI}" || die
# we need our vendored deps, too
export GOPATH="$GOPATH:$(pwd -P)/vendor"
# setup CFLAGS and LDFLAGS for separate build target
# see https://github.com/tianon/docker-overlay/pull/10
export CGO_CFLAGS="-I${ROOT}/usr/include"
export CGO_LDFLAGS="-L${ROOT}/usr/lib"
# if we're building from a zip, we need the GITCOMMIT value
[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
if gcc-specs-pie; then
sed -i 's/export LDFLAGS_STATIC="/export LDFLAGS_STATIC="-extldflags=-fno-PIC /' hack/make/dynbinary || die
grep -q '-extldflags=-fno-PIC' hack/make/dynbinary || die 'sed failed'
fi
# time to build!
./hack/make.sh dynbinary || die
if use doc; then
emake -C docs docs man || die
fi
}
src_install() {
VERSION=$(cat VERSION)
newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
exeinto /usr/libexec/docker
newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
newinitd contrib/init/openrc/docker.initd docker
newconfd contrib/init/openrc/docker.confd docker
systemd_dounit contrib/init/systemd/docker.service
udev_dorules contrib/udev/*.rules
dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
if use doc; then
dohtml -r docs/_build/html/*
doman docs/_build/man/*
fi
dobashcomp contrib/completion/bash/*
if use zsh-completion; then
insinto /usr/share/zsh/site-functions
doins contrib/completion/zsh/*
fi
if use vim-syntax; then
insinto /usr/share/vim/vimfiles
doins -r contrib/syntax/vim/ftdetect
doins -r contrib/syntax/vim/syntax
fi
insinto /usr/share/${P}/contrib
doins contrib/README
cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/"
}
pkg_postinst() {
udev_reload
elog ""
elog "To use docker, the docker daemon must be running as root. To automatically"
elog "start the docker daemon at boot, add docker to the default runlevel:"
elog " rc-update add docker default"
elog "Similarly for systemd:"
elog " systemctl enable docker.service"
elog ""
# create docker group if the code checking for it in /etc/group exists
enewgroup docker
elog "To use docker as a non-root user, add yourself to the docker group."
elog ""
}

@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>proxy-maintainers</herd>
<maintainer status="active">
<email>admwiggin@gmail.com</email>
<name>Tianon</name>
</maintainer>
<longdescription>
Docker is an open-source project to easily create lightweight,
portable, self-sufficient containers from any application. The same
@ -13,11 +8,19 @@
scale, in production, on VMs, bare metal, OpenStack clusters, public
clouds and more.
</longdescription>
<maintainer status="active">
<email>admwiggin@gmail.com</email>
<name>Tianon</name>
</maintainer>
<use>
<flag name="aufs">
Enables dependencies for the "aufs" driver, including necessary
kernel flags.
</flag>
<flag name="btrfs">
Enables dependencies for the experimental "btrfs" driver,
including necessary kernel flags.
</flag>
<flag name="device-mapper">
Enables dependencies for the "device-mapper" driver, including
necessary kernel flags.

@ -0,0 +1,76 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r13.ebuild,v 1.1 2014/02/06 00:58:07 radhermit Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
openssl tcp_wrappers_license"
KEYWORDS="-* ~amd64"
IUSE="abi_x86_32"
DEPEND=""
RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
abi_x86_32? (
>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
virtual/jpeg:62[abi_x86_32(-)]
>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
>=virtual/libusb-0-r1:0[abi_x86_32(-)]
>=virtual/libusb-1-r1:1[abi_x86_32(-)]
|| (
>=virtual/udev-206-r1[abi_x86_32(-)]
~virtual/udev-204[abi_x86_32(-)] )
>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
|| (
>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
)
>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
)
>=sys-libs/glibc-2.15" # bug 340613
PYTHON_UPDATER_IGNORE="1"
src_prepare() {
export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
emul-linux-x86_src_prepare
rm -rf "${S}/etc/env.d/binutils/" \
"${S}/usr/i686-pc-linux-gnu/lib" \
"${S}/usr/lib32/engines/" \
"${S}/usr/lib32/openldap/" || die
ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
# Remove migrated stuff.
use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
}

@ -0,0 +1,251 @@
lib32/libz.so.1
lib32/libz.so.1.2.7
usr/lib32/libz.so
usr/lib32/pkgconfig/zlib.pc
usr/lib32/libminizip.so
usr/lib32/libminizip.so.1
usr/lib32/libminizip.so.1.0.0
usr/lib32/pkgconfig/minizip.pc
lib32/libbz2.so.1
lib32/libbz2.so.1.0
lib32/libbz2.so.1.0.6
usr/lib32/libbz2.so
usr/lib32/libpng.so
usr/lib32/pkgconfig/libpng.pc
usr/lib32/libudis86.so
usr/lib32/libudis86.so.0
usr/lib32/libudis86.so.0.0.0
usr/lib32/libffi-3.0.11/include/ffi.h
usr/lib32/libffi-3.0.11/include/ffitarget.h
usr/lib32/libffi.so
usr/lib32/libffi.so.6
usr/lib32/libffi.so.6.0.0
usr/lib32/pkgconfig/libffi.pc
usr/lib32/llvm/BugpointPasses.so
usr/lib32/llvm/LLVMHello.so
usr/lib32/llvm/libLLVM-3.1.so
usr/lib32/llvm/libLTO.so
usr/lib32/llvm/libprofile_rt.so
usr/lib32/libpng12.so.0
usr/lib32/pkgconfig/libpng15.pc
usr/lib32/libraw1394.so
usr/lib32/libraw1394.so.11
usr/lib32/libraw1394.so.11.0.1
usr/lib32/pkgconfig/libraw1394.pc
usr/lib32/libavc1394.so
usr/lib32/libavc1394.so.0
usr/lib32/libavc1394.so.0.3.0
usr/lib32/pkgconfig/libavc1394.pc
usr/lib32/librom1394.so
usr/lib32/librom1394.so.0
usr/lib32/librom1394.so.0.3.0
usr/lib32/libjpeg.so
usr/lib32/libturbojpeg.so
usr/lib32/libturbojpeg.so.0*
usr/lib32/libjpeg.so.8.0.2
usr/lib32/libjpeg.so.8
usr/lib32/libjpeg.so.62
usr/lib32/libexpat.so
usr/lib32/libexpat.so.1
usr/lib32/libexpat.so.1.6.0
usr/lib32/libexpatu.so
usr/lib32/libexpatu.so.1
usr/lib32/libexpatu.so.1.6.0
usr/lib32/libexpatw.so
usr/lib32/libexpatw.so.1
usr/lib32/libexpatw.so.1.6.0
usr/lib32/pkgconfig/expat.pc
usr/lib32/pkgconfig/expatu.pc
usr/lib32/pkgconfig/expatw.pc
usr/lib32/libusb-0.1.so.4*
usr/lib32/libusb-1.0.so
usr/lib32/libusb-1.0.so.0
usr/lib32/libusb-1.0.so.0.1.0
usr/lib32/libusb.so
usr/lib32/pkgconfig/libusb-1.0.pc
usr/lib32/pkgconfig/libusb.pc
lib32/libudev.so.1*
usr/lib32/libudev.so
usr/lib32/pkgconfig/libudev.pc
lib32/libsystemd-daemon.so.0.0.7
lib32/libsystemd-daemon.so.0
usr/lib32/libsystemd-daemon.so
usr/lib32/pkgconfig/libsystemd-daemon.pc
usr/lib32/libtiff.so
usr/lib32/libtiff.so.5*
usr/lib32/libtiffxx.so
usr/lib32/libtiffxx.so.5*
usr/lib32/pkgconfig/libtiff-4.pc
lib32/libattr.so.1
lib32/libattr.so.1.1.0
usr/lib32/libattr.so
usr/lib32/glib-2.0/include/glibconfig.h
usr/lib32/libglib-2.0.so
usr/lib32/libglib-2.0.so.0
usr/lib32/libglib-2.0.so.0.3200.4
usr/lib32/pkgconfig/glib-2.0.pc
usr/lib32/libgmodule-2.0.so
usr/lib32/libgmodule-2.0.so.0
usr/lib32/libgmodule-2.0.so.0.3200.4
usr/lib32/pkgconfig/gmodule-2.0.pc
usr/lib32/libgio-2.0.so
usr/lib32/libgio-2.0.so.0
usr/lib32/libgio-2.0.so.0.3200.4
usr/lib32/pkgconfig/gio-2.0.pc
usr/lib32/libgobject-2.0.so
usr/lib32/libgobject-2.0.so.0
usr/lib32/libgobject-2.0.so.0.3200.4
usr/lib32/pkgconfig/gobject-2.0.pc
usr/lib32/libgthread-2.0.so
usr/lib32/libgthread-2.0.so.0
usr/lib32/libgthread-2.0.so.0.3200.4
usr/lib32/pkgconfig/gthread-2.0.pc
usr/lib32/pkgconfig/gio-unix-2.0.pc
usr/lib32/pkgconfig/gmodule-export-2.0.pc
usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
usr/lib32/liblcms2.so
usr/lib32/liblcms2.so.2
usr/lib32/liblcms2.so.2.0.3
usr/lib32/pkgconfig/lcms2.pc
usr/lib32/libpaper.so
usr/lib32/libpaper.so.1
usr/lib32/libpaper.so.1.1.2
usr/lib32/libtiff.so.3
usr/lib32/libtiff.so.4
usr/lib32/libtiffxx.so.3
usr/lib32/libtiffxx.so.4
usr/lib32/elfutils/libebl_alpha-0.149.so
usr/lib32/elfutils/libebl_alpha.so
usr/lib32/elfutils/libebl_arm-0.149.so
usr/lib32/elfutils/libebl_arm.so
usr/lib32/elfutils/libebl_i386-0.149.so
usr/lib32/elfutils/libebl_i386.so
usr/lib32/elfutils/libebl_ia64-0.149.so
usr/lib32/elfutils/libebl_ia64.so
usr/lib32/elfutils/libebl_ppc-0.149.so
usr/lib32/elfutils/libebl_ppc.so
usr/lib32/elfutils/libebl_ppc64-0.149.so
usr/lib32/elfutils/libebl_ppc64.so
usr/lib32/elfutils/libebl_s390-0.149.so
usr/lib32/elfutils/libebl_s390.so
usr/lib32/elfutils/libebl_sh-0.149.so
usr/lib32/elfutils/libebl_sh.so
usr/lib32/elfutils/libebl_sparc-0.149.so
usr/lib32/elfutils/libebl_sparc.so
usr/lib32/elfutils/libebl_x86_64-0.149.so
usr/lib32/elfutils/libebl_x86_64.so
usr/lib32/libelf-0.149.so
usr/lib32/libelf.so
usr/lib32/libelf.so.1
usr/lib32/libasm-0.149.so
usr/lib32/libasm.so
usr/lib32/libasm.so.1
usr/lib32/libdw-0.149.so
usr/lib32/libdw.so
usr/lib32/libdw.so.1
lib32/libss.so.2
lib32/libss.so.2.0
usr/lib32/libss.so
usr/lib32/pkgconfig/ss.pc
lib32/libcom_err.so.2
lib32/libcom_err.so.2.1
usr/lib32/libcom_err.so
usr/lib32/pkgconfig/com_err.pc
usr/lib32/libcurses.so
usr/lib32/libform.so
usr/lib32/libform.so.5
usr/lib32/libform.so.5.9
usr/lib32/libformw.so
usr/lib32/libformw.so.5
usr/lib32/libformw.so.5.9
usr/lib32/libmenu.so
usr/lib32/libmenu.so.5
usr/lib32/libmenu.so.5.9
usr/lib32/libmenuw.so
usr/lib32/libmenuw.so.5
usr/lib32/libmenuw.so.5.9
lib32/libncurses.so.5
lib32/libncurses.so.5.9
lib32/libncursesw.so.5
lib32/libncursesw.so.5.9
usr/lib32/libncurses.so
usr/lib32/libncursesw.so
usr/lib32/libpanel.so
usr/lib32/libpanel.so.5
usr/lib32/libpanel.so.5.9
usr/lib32/libpanelw.so
usr/lib32/libpanelw.so.5
usr/lib32/libpanelw.so.5.9
usr/lib32/pkgconfig/form.pc
usr/lib32/pkgconfig/formw.pc
usr/lib32/pkgconfig/ncurses++.pc
usr/lib32/pkgconfig/ncurses++w.pc
usr/lib32/pkgconfig/menuw.pc
usr/lib32/pkgconfig/menu.pc
usr/lib32/pkgconfig/ncurses.pc
usr/lib32/pkgconfig/ncursesw.pc
usr/lib32/pkgconfig/panel.pc
usr/lib32/pkgconfig/panelw.pc
usr/lib32/terminfo
lib32/libgpm.so.1
lib32/libgpm.so.1.20.0
usr/lib32/libgpm.so
usr/lib32/libgmp.so*
usr/lib32/libgmpxx.so*
lib32/libpcre.so.1
lib32/libpcre.so.1.2.1
usr/lib32/libpcre.so
usr/lib32/libpcrecpp.so
usr/lib32/libpcrecpp.so.0
usr/lib32/libpcrecpp.so.0.0.0
usr/lib32/libpcreposix.so
usr/lib32/libpcreposix.so.0
usr/lib32/libpcreposix.so.0.0.2
usr/lib32/pkgconfig/libpcre.pc
usr/lib32/pkgconfig/libpcrecpp.pc
usr/lib32/pkgconfig/libpcreposix.pc
usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
usr/lib32/libdbus-1.so
usr/lib32/libdbus-1.so.3
usr/lib32/libdbus-1.so.3.7.4
usr/lib32/pkgconfig/dbus-1.pc
lib32/libwrap.so
lib32/libwrap.so.0
lib32/libwrap.so.0.7.6
usr/lib32/libwrap.so
usr/lib32/libgdbm.so
usr/lib32/libgdbm.so.3
usr/lib32/libgdbm.so.3.0.0
usr/lib32/libgdbm_compat.so
usr/lib32/libgdbm_compat.so.3
usr/lib32/libgdbm_compat.so.3.0.0
usr/lib32/libjson.so
usr/lib32/libjson.so.0
usr/lib32/libjson.so.0.0.1
usr/lib32/pkgconfig/json.pc
usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
usr/lib32/python2.7/lib-dynload/dbm.so
usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
usr/lib32/python2.7/lib-dynload/gdbm.so
usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
usr/lib32/libxml2.so*
usr/lib32/pkgconfig/libxml-2.0.pc
usr/lib32/python*/site-packages/libxml2mod.so
usr/lib32/libdbus-glib-1.so
usr/lib32/libdbus-glib-1.so.2
usr/lib32/libdbus-glib-1.so.2.2.2
usr/lib32/pkgconfig/dbus-glib-1.pc
lib32/libreadline.so.6
lib32/libreadline.so.6.2
usr/lib32/libreadline.so
lib32/libhistory.so.6
lib32/libhistory.so.6.2
usr/lib32/libhistory.so
usr/lib32/libmng.so
usr/lib32/libasprintf.so
usr/lib32/libasprintf.so.0
usr/lib32/libasprintf.so.0.0.0
usr/lib32/libgpg-error.so
usr/lib32/libgpg-error.so.0
usr/lib32/libgpg-error.so.0.8.0

@ -0,0 +1,69 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.4.3-r2.ebuild,v 1.1 2014/02/06 06:09:01 radhermit Exp $
EAPI="5"
USE_RUBY="ruby20"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
RUBY_FAKEGEM_EXTRAINSTALL="config keys plugins templates"
RUBY_FAKEGEM_TASK_DOC=""
inherit ruby-fakegem eutils
DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
HOMEPAGE="http://vagrantup.com/"
SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x64-macos"
IUSE="test"
# Missing ebuild for contest
RESTRICT="test"
RDEPEND="${RDEPEND}
app-arch/libarchive
net-misc/curl
!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
ruby_add_rdepend "
>=dev-ruby/childprocess-0.3.7
>=dev-ruby/erubis-2.7.0
dev-ruby/i18n:0.6
>=dev-ruby/json-1.5.1
>=dev-ruby/log4r-1.1.9
>=dev-ruby/net-ssh-2.6.6
>=dev-ruby/net-scp-1.1.0
"
ruby_add_bdepend "
dev-ruby/rake
test? ( dev-ruby/mocha virtual/ruby-minitest )
"
all_ruby_prepare() {
# remove bundler support
sed -i '/[Bb]undler/d' Rakefile || die
rm Gemfile || die
# loosen dependencies
sed -e '/childprocess\|erubis\|log4r\|net-scp/s/~>/>=/' \
-e '/net-ssh/s:, "< 2.8.0"::' \
-i ${PN}.gemspec || die
epatch "${FILESDIR}"/${PN}-1.2.1-no-warning.patch
epatch "${FILESDIR}"/${PN}-1.2.2-rvm.patch
}
pkg_postinst() {
if use x64-macos ; then
ewarn
ewarn "For Mac OS X prefixes, you must install the virtualbox"
ewarn "package specifically for OS X which can be found at:"
ewarn "https://www.virtualbox.org/wiki/Downloads"
ewarn
fi
}

@ -1,4 +1,3 @@
DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1
DIST tbb41_20130116oss_src.tgz 2461689 SHA256 4ae2c10899e3b6ef2f686013ec5901fc658444ca90178efaca6014b0665c34b6 SHA512 a537411cf9ae66caaa97af33fbc1e56b6598be7b14526c42fd24cedebac06b1979b39c89b080ff9ff353a1ce82b1d10c4863add79fb15578dd3b1598aea1200f WHIRLPOOL 279eb059a4877cd11d7c01bd8483885c12fbb389c51d0944cfe96270051705b8b42b6d6273533bfb668c231a557fe0cc127b091f2ba88237349137a8015e5654
DIST tbb41_20130613oss_src.tgz 2089588 SHA256 a5234941ecc390b07a2d3e038cf4cf87ab48adc3f0e40e1c6ef0b625d850bab8 SHA512 00123264d300832fd6494814043f2bf10097946d24ec2dec8273aaf54b2d777ecef09f055a731f786d40fcff9be404fc4107e9e4d17afb3ce2e4da1cd6d0b3ea WHIRLPOOL c094850581d4a894e89804eaec999e84e034e1ec4f4a1e779d956ac5687f533cc2aa55e171e331a9622cc0ceb9d65d954a72439d21c4c39464d4f553b70dd579
DIST tbb42_20131003oss_src.tgz 2118935 SHA256 dca8af40bcd69e434620c5800a6f464c78ab410a75d02f40547e851cc4d1519a SHA512 0e7b8ae9bb3600e6f5eaf25997a07e106416afa336549b34a90e97534685127bee612f798511c6da7b08c0116056565fe7022c773ff8e3eb6d9c69ab4ceaeda5 WHIRLPOOL 48e4e6de170fce2e67ff51adae3fc6fa69edcd444b68dfcc2da335a70661c39069801d7f15f52efd9c5064cbc420ad0f13115dd4ffae9595ce50a8dab0c3186d
DIST tbb42_20131118oss_src.tgz 3134290 SHA256 d95b816ac1618f5047d9ac4db1709d1f8bbeafaed597ce1ee7862b9577680882 SHA512 1f3e2bd807b7fa0cf42c712353cc2a622ddad22fe64359e668480617831ac595a46fa8db86ecd0376989cb4928bb4febe4d11a0f27c26437c60ed0a61c451174 WHIRLPOOL 90cc7de2309588dc546c4380d26211edc118f7dd7f1d7e15dcb38facb2ca0da9020129f1c03e4110eeb9b5991203aa0da0ff1561ed9da7cedcc2298e1b2e2a50

@ -1,11 +0,0 @@
--- build/Makefile.test.orig 2010-10-26 10:22:22.058506834 +1100
+++ build/Makefile.test 2010-10-26 10:22:38.370427924 +1100
@@ -159,7 +159,7 @@
# If a component Y uses component X, then tests for Y should come after tests for X.
# Note that usually run_cmd is empty, and tests run directly
test_tbb_plain: $(TEST_PREREQUISITE) $(TASK_CPP_DIRECTLY_INCLUDED) $(TEST_TBB_PLAIN.EXE)
- $(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args)
+ #$(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args)
# Checking TBB version first to make sure the following testing has anything in it
$(run_cmd) ./test_assembly.$(TEST_EXT) $(args)
$(run_cmd) ./test_atomic.$(TEST_EXT) $(args)

@ -1,203 +0,0 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Thu May 31 21:37:47 UTC 2012
Subject: build system
respect LDFLAGS properly
wrt https://bugs.gentoo.org/show_bug.cgi?id=418453
--- build/common_rules.inc
+++ build/common_rules.inc
@@ -44,8 +44,6 @@
ifeq ($(tbb_cpf),1)
CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
endif
-LINK_FLAGS += $(LDFLAGS)
-LIB_LINK_FLAGS += $(LDFLAGS)
CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS))
LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)
--- build/Makefile.rml
+++ build/Makefile.rml
@@ -103,7 +103,7 @@
$(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
$(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
ifneq (,$(RML_NO_VERSION.DLL))
$(RML_NO_VERSION.DLL):
@@ -126,13 +126,13 @@
RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT)
test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
rml_omp_stub.$(OBJ): rml_omp_stub.cpp
$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $<
@@ -141,7 +141,7 @@
$(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS)
test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
### run_cmd is usually empty
rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS)
--- build/Makefile.tbb
+++ build/Makefile.tbb
@@ -115,7 +115,7 @@
$(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL)
$(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
ifneq (,$(TBB_NO_VERSION.DLL))
$(TBB_NO_VERSION.DLL):
--- build/Makefile.tbbmalloc
+++ build/Makefile.tbbmalloc
@@ -82,7 +82,7 @@
$(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
$(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
- $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
+ $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
ifneq (,$(MALLOCPROXY.DEF))
tbbmallocproxy.def: $(MALLOCPROXY.DEF)
@@ -95,7 +95,7 @@
ifneq (,$(MALLOCPROXY.DLL))
$(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL)
$(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
endif
ifneq (,$(MALLOC_NO_VERSION.DLL))
@@ -143,32 +143,32 @@
endif
test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp
- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.tmp
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS)
$(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
ifeq (,$(NO_C_TESTS))
MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT)
$(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS)
endif
# Rules for generating a test DLL
%_dll.$(DLL): %_dll.$(OBJ)
- $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(DYLIB_KEY) $(LIB_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(DYLIB_KEY) $(LIB_LINK_FLAGS)
test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT)
ifneq (,$(MALLOCPROXY.DLL))
--- build/Makefile.tbbproxy
+++ build/Makefile.tbbproxy
@@ -102,7 +102,7 @@
# Link rules.
$(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
# Compilation rules.
$(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp
--- build/Makefile.test
+++ build/Makefile.test
@@ -55,26 +55,26 @@
# Rule for generating executable test
%.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
# Rules for generating a test DLL
%_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
.PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
# Rules for the tests, which use TBB in a dynamically loadable library
test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=)
test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
# Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes)
# The issue reveals itself if a version of binutils is prior to 2.17
ifeq (linux,$(tbb_os))
ifeq (icc,$(compiler))
test_cilk_interop.$(TEST_EXT): test_cilk_interop.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) -lcilkrts
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) -lcilkrts
endif
endif
@@ -92,18 +92,18 @@
$(TASK_CPP_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
$(TASK_CPP_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(TASK_CPP_DEPENDENCIES)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
test_tbb_header2.$(OBJ): test_tbb_header.cpp
$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
# Detecting "multiple definition" linker error using the test that covers the whole library
test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
# Checks that TBB atomics work correctly in position independent code
test_atomic_pic.$(TEST_EXT): test_atomic.cpp
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(LDFLAGS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
# The main list of TBB tests
TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT) \
@@ -188,7 +188,7 @@
ifdef OPENMP_FLAG
TEST_TBB_PLAIN.EXE += test_tbb_openmp
test_openmp.$(TEST_EXT): test_openmp.cpp
- $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
+ $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
.PHONY: test_tbb_openmp
test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT)
$(run_cmd) ./test_openmp.$(TEST_EXT) 1:4

@ -1,231 +0,0 @@
From: Sebastien Fabbro <bicatali@gentoo.org>
Date: Thu Sep 13 15:13:19 PDT 2012
Subject: build system
respect LDFLAGS properly
wrt https://bugs.gentoo.org/show_bug.cgi?id=418453
diff -Nur tbb41_20120718oss.orig/build/common_rules.inc tbb41_20120718oss/build/common_rules.inc
--- tbb41_20120718oss.orig/build/common_rules.inc 2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/common_rules.inc 2012-09-13 14:58:45.556908494 -0700
@@ -44,8 +44,6 @@
ifeq ($(tbb_cpf),1)
CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
endif
-LINK_FLAGS += $(LDFLAGS)
-LIB_LINK_FLAGS += $(LDFLAGS)
CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS))
LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)
diff -Nur tbb41_20120718oss.orig/build/Makefile.rml tbb41_20120718oss/build/Makefile.rml
--- tbb41_20120718oss.orig/build/Makefile.rml 2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.rml 2012-09-13 14:58:45.556908494 -0700
@@ -103,7 +103,7 @@
$(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
$(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
ifneq (,$(RML_NO_VERSION.DLL))
$(RML_NO_VERSION.DLL):
@@ -126,13 +126,13 @@
RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT)
test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
rml_omp_stub.$(OBJ): rml_omp_stub.cpp
$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $<
@@ -141,7 +141,7 @@
$(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS)
test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
### run_cmd is usually empty
rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS)
diff -Nur tbb41_20120718oss.orig/build/Makefile.tbb tbb41_20120718oss/build/Makefile.tbb
--- tbb41_20120718oss.orig/build/Makefile.tbb 2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.tbb 2012-09-13 14:58:45.556908494 -0700
@@ -120,7 +120,7 @@
$(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL)
$(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
ifneq (,$(TBB_NO_VERSION.DLL))
$(TBB_NO_VERSION.DLL):
diff -Nur tbb41_20120718oss.orig/build/Makefile.tbbmalloc tbb41_20120718oss/build/Makefile.tbbmalloc
--- tbb41_20120718oss.orig/build/Makefile.tbbmalloc 2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.tbbmalloc 2012-09-13 15:06:11.893254873 -0700
@@ -82,7 +82,7 @@
$(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
$(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
- $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
+ $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
ifneq (,$(MALLOCPROXY.DEF))
tbbmallocproxy.def: $(MALLOCPROXY.DEF)
@@ -95,7 +95,7 @@
ifneq (,$(MALLOCPROXY.DLL))
$(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL)
$(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
endif
ifneq (,$(MALLOC_NO_VERSION.DLL))
@@ -143,38 +143,38 @@
endif
test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp
- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.ver
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS)
# TODO: use generic rules
test_malloc_used_by_lib.$(TEST_EXT): test_malloc_used_by_lib.cpp test_malloc_used_by_lib.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
test_malloc_used_by_lib.$(DLL): test_malloc_used_by_lib.cpp
$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/LD,$(M_CPLUS_FLAGS)) $(PIC_KEY) $(M_INCLUDES) $(DEFINE_KEY)_USRDLL $< $(MALLOC_LIB) $(LINK_FLAGS) $(DYLIB_KEY)
$(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT)
$(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS)
# Rules for generating a test DLL
%_dll.$(DLL): %_dll.$(OBJ)
- $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
.PRECIOUS: %_dll.$(OBJ)
test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT) test_malloc_used_by_lib.$(TEST_EXT)
ifneq (,$(MALLOCPROXY.DLL))
diff -Nur tbb41_20120718oss.orig/build/Makefile.tbbproxy tbb41_20120718oss/build/Makefile.tbbproxy
--- tbb41_20120718oss.orig/build/Makefile.tbbproxy 2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.tbbproxy 2012-09-13 14:58:45.557908491 -0700
@@ -102,7 +102,7 @@
# Link rules.
$(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
# Compilation rules.
$(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp
diff -Nur tbb41_20120718oss.orig/build/Makefile.test tbb41_20120718oss/build/Makefile.test
--- tbb41_20120718oss.orig/build/Makefile.test 2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.test 2012-09-13 15:10:46.438703091 -0700
@@ -55,17 +55,17 @@
# Rule for generating executable test
%.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
# Rules for generating a test DLL
%_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
.PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
# Rules for the tests, which use TBB in a dynamically loadable library
test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=)
test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
# tbb_misc.$(OBJ) has to be specified here (instead of harness_inject_scheduler.h) because it carries dependency on version_string.ver
@@ -82,31 +82,31 @@
$(SCHEDULER_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
$(SCHEDULER_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(SCHEDULER_DEPENDENCIES)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
# Tests that use some features of C++11
TEST_TBB_CPP11 = test_lambda.$(TEST_EXT) test_cache_aligned_allocator_STL.$(TEST_EXT)
$(TEST_TBB_CPP11:%.$(TEST_EXT)=%.$(OBJ)): %.$(OBJ): %.cpp
- $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
+ $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
$(TEST_TBB_CPP11): %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
test_tbb_header2.$(OBJ): test_tbb_header.cpp
- $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
+ $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
# Detecting "multiple definition" linker error using the test that covers the whole library
test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
# Checks that TBB atomics work correctly in position independent code
test_atomic_pic.$(TEST_EXT): test_atomic.cpp
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
#Test of generic gcc port
%_compiler_builtins.$(TEST_EXT): CPLUS_FLAGS+=$(DEFINE_KEY)__TBB_TEST_GCC_BUILTINS=1
%_compiler_builtins.$(TEST_EXT): %.cpp
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
# The main list of TBB tests
TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT) \
@@ -192,7 +192,7 @@
ifdef OPENMP_FLAG
test_openmp.$(TEST_EXT): test_openmp.cpp
- $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
+ $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT)
$(run_cmd) ./test_openmp.$(TEST_EXT) 1:4
else
@@ -202,7 +202,7 @@
ifdef CILK_AVAILABLE
test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
# Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes)
# The issue reveals itself if a version of binutils is prior to 2.17
ifeq (linux_icc,$(tbb_os)_$(compiler))

@ -1,239 +0,0 @@
build/Makefile.rml | 10 +++++-----
build/Makefile.tbb | 2 +-
build/Makefile.tbbmalloc | 22 +++++++++++-----------
build/Makefile.tbbproxy | 2 +-
build/Makefile.test | 26 +++++++++++++-------------
build/common_rules.inc | 2 --
6 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/build/Makefile.rml b/build/Makefile.rml
index 809b013..df3f2d1 100644
--- a/build/Makefile.rml
+++ b/build/Makefile.rml
@@ -103,7 +103,7 @@ endif
$(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
$(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
ifneq (,$(RML_NO_VERSION.DLL))
$(RML_NO_VERSION.DLL):
@@ -126,13 +126,13 @@ cross_suffix=$(if $(crosstest),$(if $(DEBUG_SUFFIX),$(subst _debug,,$(1)),$(call
RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT)
test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
rml_omp_stub.$(OBJ): rml_omp_stub.cpp
$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $<
@@ -141,7 +141,7 @@ test_rml_omp_c_linkage.$(TEST_EXT): test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$
$(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS)
test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
### run_cmd is usually empty
rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS)
diff --git a/build/Makefile.tbb b/build/Makefile.tbb
index fded71b..eb2642b 100644
--- a/build/Makefile.tbb
+++ b/build/Makefile.tbb
@@ -120,7 +120,7 @@ tbbvars.sh:
$(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL)
$(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
ifneq (,$(TBB_NO_VERSION.DLL))
$(TBB_NO_VERSION.DLL):
diff --git a/build/Makefile.tbbmalloc b/build/Makefile.tbbmalloc
index 8fab075..81c5e11 100644
--- a/build/Makefile.tbbmalloc
+++ b/build/Makefile.tbbmalloc
@@ -82,7 +82,7 @@ endif
$(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
$(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
- $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
+ $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
ifneq (,$(MALLOCPROXY.DEF))
tbbmallocproxy.def: $(MALLOCPROXY.DEF)
@@ -95,7 +95,7 @@ endif
ifneq (,$(MALLOCPROXY.DLL))
$(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL)
$(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES)
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
endif
ifneq (,$(MALLOC_NO_VERSION.DLL))
@@ -143,38 +143,38 @@ test_malloc_overload.$(TEST_EXT): LIBS += $(MALLOC_PROXY_LIB)
endif
test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp
- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.ver
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS)
# TODO: use generic rules
test_malloc_used_by_lib.$(TEST_EXT): test_malloc_used_by_lib.cpp test_malloc_used_by_lib.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
test_malloc_used_by_lib.$(DLL): test_malloc_used_by_lib.cpp
$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/LD,$(M_CPLUS_FLAGS)) $(PIC_KEY) $(M_INCLUDES) $(DEFINE_KEY)_USRDLL $< $(MALLOC_LIB) $(LINK_FLAGS) $(DYLIB_KEY)
$(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT)
$(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS)
# Rules for generating a test DLL
%_dll.$(DLL): %_dll.$(OBJ)
- $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
.PRECIOUS: %_dll.$(OBJ)
test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT) test_malloc_used_by_lib.$(TEST_EXT)
ifneq (,$(MALLOCPROXY.DLL))
diff --git a/build/Makefile.tbbproxy b/build/Makefile.tbbproxy
index eb60d2f..4821a45 100644
--- a/build/Makefile.tbbproxy
+++ b/build/Makefile.tbbproxy
@@ -102,7 +102,7 @@ endif
# Link rules.
$(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
# Compilation rules.
$(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp
diff --git a/build/Makefile.test b/build/Makefile.test
index bcc5987..fa42b03 100644
--- a/build/Makefile.test
+++ b/build/Makefile.test
@@ -55,17 +55,17 @@ include $(tbb_root)/build/common_rules.inc
# Rule for generating executable test
%.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
# Rules for generating a test DLL
%_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
.PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
# Rules for the tests, which use TBB in a dynamically loadable library
test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=)
test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
# tbb_misc.$(OBJ) has to be specified here (instead of harness_inject_scheduler.h) because it carries dependency on version_string.ver
@@ -82,31 +82,31 @@ INCLUDES += $(INCLUDE_KEY).
$(SCHEDULER_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
$(SCHEDULER_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(SCHEDULER_DEPENDENCIES)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
# Tests that use some features of C++11
TEST_TBB_CPP11 = test_lambda.$(TEST_EXT) test_cache_aligned_allocator_STL.$(TEST_EXT)
$(TEST_TBB_CPP11:%.$(TEST_EXT)=%.$(OBJ)): %.$(OBJ): %.cpp
- $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
+ $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
$(TEST_TBB_CPP11): %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
test_tbb_header2.$(OBJ): test_tbb_header.cpp
- $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
+ $(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
# Detecting "multiple definition" linker error using the test that covers the whole library
test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
# Checks that TBB atomics work correctly in position independent code
test_atomic_pic.$(TEST_EXT): test_atomic.cpp
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
#Test of generic gcc port and icc intrinsics port
%_compiler_builtins.$(TEST_EXT): CPLUS_FLAGS+=$(DEFINE_KEY)__TBB_TEST_BUILTINS=1
%_compiler_builtins.$(TEST_EXT): %.cpp
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
# The main list of TBB tests
TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT) \
@@ -192,7 +192,7 @@ TEST_TBB_PLAIN.EXE += $(TEST_TBB_CPP11)
ifdef OPENMP_FLAG
test_openmp.$(TEST_EXT): test_openmp.cpp
- $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
+ $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT)
$(run_cmd) ./test_openmp.$(TEST_EXT) 1:4
else
@@ -202,7 +202,7 @@ endif
ifdef CILK_AVAILABLE
test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL)
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
# Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes)
# The issue reveals itself if a version of binutils is prior to 2.17
ifeq (linux_icc,$(tbb_os)_$(compiler))
diff --git a/build/common_rules.inc b/build/common_rules.inc
index 6aa20f2..46cac4e 100644
--- a/build/common_rules.inc
+++ b/build/common_rules.inc
@@ -44,8 +44,6 @@ CPLUS_FLAGS += $(WARNING_KEY) $(CXXFLAGS)
ifeq ($(tbb_cpf),1)
CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
endif
-LINK_FLAGS += $(LDFLAGS)
-LIB_LINK_FLAGS += $(LDFLAGS)
CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS))
LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)

@ -1,123 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20130116-r1.ebuild,v 1.2 2013/05/02 15:54:43 dilfridge Exp $
EAPI=5
inherit eutils flag-o-matic multilib versionator toolchain-funcs
PV1="$(get_version_component_range 1)"
PV2="$(get_version_component_range 2)"
PV3="$(get_version_component_range 3)"
MYP="${PN}${PV1}${PV2}_${PV3}oss"
DESCRIPTION="High level abstract threading library"
HOMEPAGE="http://www.threadingbuildingblocks.org/"
SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
LICENSE="GPL-2-with-exceptions"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc examples"
DEPEND=""
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MYP}"
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
"${FILESDIR}"/${PN}-4.1.20121003-ppc.patch
# use fully qualified gcc compilers. do not force march/mcpu
# not tested with icc
# order in sed expressions is important
sed -i \
-e "s/g++/$(tc-getCXX)/g" \
-e "s/gcc/$(tc-getCC)/g" \
-e 's/-m\(arch\|cpu\)=*[[:space:]]//g' \
-e 's/-\(m\|-\)\(64\|32\)//g' \
-e 's/-O2/$(CXXFLAGS)/g' \
-e "/^ASM/s/as/$(tc-getAS)/g" \
build/*.gcc.inc || die
# force 64bit where applicable, 32bit where applicable...
# built-in detection is based on running kernel, which messes up
# e.g. in a x86 chroot on amd64 kernel. Bug 462130
# see build/linux.inc for values
use amd64 && export arch=x86_64
use amd64-linux && export arch=x86_64
use x86 && export arch=ia32
use x86-linux && export arch=ia32
# no idea what to do with ppc but so far it seems to work
find include -name \*.html -delete || die
# pc files are for debian and fedora compatibility
# some deps use them
cat <<-EOF > ${PN}.pc.template
prefix=${EPREFIX}/usr
libdir=\${prefix}/$(get_libdir)
includedir=\${prefix}/include
Name: ${PN}
Description: ${DESCRIPTION}
Version: ${PV}
URL: ${HOMEPAGE}
Cflags: -I\${includedir}
EOF
cp ${PN}.pc.template ${PN}.pc
cat <<-EOF >> ${PN}.pc
Libs: -L\${libdir} -ltbb
Libs.private: -lm -lrt
EOF
cp ${PN}.pc.template ${PN}malloc.pc
cat <<-EOF >> ${PN}malloc.pc
Libs: -L\${libdir} -ltbbmalloc
Libs.private: -lm -lrt
EOF
cp ${PN}.pc.template ${PN}malloc_proxy.pc
cat <<-EOF >> ${PN}malloc_proxy.pc
Libs: -L\${libdir} -ltbbmalloc_proxy
Libs.private: -lrt
Requires: tbbmalloc
EOF
use debug || sed -i -e '/_debug/d' Makefile
}
src_compile() {
if [[ $(tc-getCXX) == *g++ ]]; then
comp="gcc"
elif [[ $(tc-getCXX) == *ic*c ]]; then
comp="icc"
else
die "compiler $(tc-getCXX) not supported by build system"
fi
emake compiler=${comp} tbb tbbmalloc
}
src_test() {
append-cxxflags -fabi-version=4
# avoid oversubscribing with -j1
emake -j1 compiler=${comp} test
}
src_install(){
local l
for l in $(find build -name lib\*.so.\*); do
dolib.so ${l}
local bl=$(basename ${l})
dosym ${bl} /usr/$(get_libdir)/${bl%.*}
done
doheader -r include/*
insinto /usr/$(get_libdir)/pkgconfig
doins *.pc
dodoc README CHANGES doc/Release_Notes.txt
use doc && dohtml -r doc/html/*
if use examples ; then
insinto /usr/share/doc/${PF}/examples/build
doins build/*.inc
insinto /usr/share/doc/${PF}/examples
doins -r examples
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20130613.ebuild,v 1.3 2013/08/27 20:20:16 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20131118.ebuild,v 1.1 2014/02/05 18:10:26 bicatali Exp $
EAPI=5
inherit eutils flag-o-matic multilib versionator toolchain-funcs

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashable/hashable-1.2.1.0.ebuild,v 1.2 2014/01/18 19:16:56 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashable/hashable-1.2.1.0.ebuild,v 1.3 2014/02/05 12:07:22 nimiux Exp $
EAPI=5
@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+sse2 sse4_1"
RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]

@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci</herd>
<maintainer>
<email>weaver@gentoo.org</email>
<name>Andrey Kislyuk</name>
</maintainer>
<longdescription lang="en">
The Intel® C++ Compiler is a full featured C/C++ compiler for Intel
based architectures. The compiler supports multi-threading, automatic

@ -0,0 +1 @@
DIST c-blosc-1.3.2.tar.gz 229790 SHA256 7c21c4484c1ad7d6beddd73f35379e0d980530466cd6d87402e035c931983697 SHA512 0488042628b8b3d02e8e7b58d3d942751a43567e99e1e89f452765ad1aeba395248322df6a37daf828571b3c262ebaa54d3ca49cfed78ab499994454faf6bbdb WHIRLPOOL 195232123fbbd4f76f3a209069e7895c3ba900e98c49ca8334e1975634770463d993ae36f99fefb680d7c78a28ca979c27cd4af4412e83c804315f6cf52420fe

@ -0,0 +1,41 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.2.ebuild,v 1.1 2014/02/06 01:00:17 bicatali Exp $
EAPI=5
inherit cmake-utils
DESCRIPTION="Blocking, shuffling and lossless compression library"
HOMEPAGE="http://www.blosc.org/"
SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="hdf5 +lz4 +snappy static-libs test zlib"
RDEPEND="
hdf5? ( sci-libs/hdf5 )
lz4? ( app-arch/lz4 )
snappy? ( app-arch/snappy )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}"/${P}-shared-libs.patch )
src_configure() {
local mycmakeargs=(
-DBUILD_BENCHMARKS=OFF
-DPREFER_EXTERNAL_COMPLIBS=ON
$(cmake-utils_use hdf5 BUILD_HDF5_FILTER)
$(cmake-utils_use !lz4 DEACTIVATE_LZ4)
$(cmake-utils_use !snappy DEACTIVATE_SNAPPY)
$(cmake-utils_use static-libs BUILD_STATIC)
$(cmake-utils_use test BUILD_TESTS)
$(cmake-utils_use !zlib DEACTIVATE_ZLIB)
)
cmake-utils_src_configure
}

@ -0,0 +1,22 @@
--- hdf5/CMakeLists.txt.orig 2014-02-05 16:55:55.001344161 -0800
+++ hdf5/CMakeLists.txt 2014-02-05 16:57:03.767739650 -0800
@@ -23,16 +23,16 @@
# install
install(FILES blosc_filter.h DESTINATION include COMPONENT HDF5_FILTER_DEV)
-install(TARGETS blosc_filter_static DESTINATION lib COMPONENT HDF5_FILTER)
+install(TARGETS blosc_filter_shared DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER)
if(BUILD_STATIC)
install(
- TARGETS blosc_filter_shared DESTINATION lib COMPONENT HDF5_FILTER_DEV)
+ TARGETS blosc_filter_static DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER_DEV)
endif(BUILD_STATIC)
# test
if(BUILD_TESTS)
add_executable(example example.c)
- target_link_libraries(example blosc_filter_static ${HDF5_LIBRARIES})
+ target_link_libraries(example blosc_filter_shared ${HDF5_LIBRARIES})
add_test(test_hdf5_filter example)
endif(BUILD_TESTS)

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>bicatali@gentoo.org</email>
<description>Feel free to update and/or fix</description>
</maintainer>
<longdescription lang='en'>
Blosc is a compression library designed to transmit data to the
processor cache faster than the traditional non-compressed memory fetch.
Compression ratios are not very high, but the decompression is very
fast. Blosc is meant not only to reduce the size of large datasets on-disk
or in-memory, but also to accelerate memory-bound computations.
</longdescription>
<use>
<flag name="lz4">Enable lz4 compression</flag>
<flag name="snappy">Enable snappy compression</flag>
</use>
</pkgmetadata>

@ -0,0 +1,93 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild,v 1.1 2014/02/05 14:12:50 ssuominen Exp $
EAPI=5
inherit eutils libtool multilib toolchain-funcs multilib-minimal
DESCRIPTION="XML parsing libraries"
HOMEPAGE="http://expat.sourceforge.net/"
SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="elibc_FreeBSD examples static-libs unicode"
RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
src_prepare() {
epatch "${FILESDIR}"/${P}-xmlwfargs.patch
elibtoolize
}
multilib_src_configure() {
local myconf="$(use_enable static-libs static)"
mkdir -p "${BUILD_DIR}"{u,w} || die
ECONF_SOURCE="${S}" econf ${myconf}
if use unicode; then
pushd "${BUILD_DIR}"u >/dev/null
CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
popd >/dev/null
pushd "${BUILD_DIR}"w >/dev/null
CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
popd >/dev/null
fi
}
multilib_src_compile() {
emake
if use unicode; then
pushd "${BUILD_DIR}"u >/dev/null
emake buildlib LIBRARY=libexpatu.la
popd >/dev/null
pushd "${BUILD_DIR}"w >/dev/null
emake buildlib LIBRARY=libexpatw.la
popd >/dev/null
fi
}
multilib_src_install() {
emake install DESTDIR="${D}"
if use unicode; then
pushd "${BUILD_DIR}"u >/dev/null
emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
popd >/dev/null
pushd "${BUILD_DIR}"w >/dev/null
emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
popd >/dev/null
pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
cp expat.pc expatu.pc
sed -i -e '/^Libs/s:-lexpat:&u:' expatu.pc || die
cp expat.pc expatw.pc
sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
popd >/dev/null
fi
if multilib_build_binaries ; then
# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
use elibc_FreeBSD && gen_usr_ldscript -a expat
fi
}
multilib_src_install_all() {
dodoc Changes README
dohtml doc/*
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins examples/*.c
fi
prune_libtool_files
}

@ -0,0 +1,15 @@
Fix "xmlwf -h" output
Patch is from: http://pkgs.fedoraproject.org/cgit/expat.git/plain/expat-2.1.0-xmlwfargs.patch
--- xmlwf/xmlwf.c
+++ xmlwf/xmlwf.c
@@ -634,7 +634,7 @@ static void
usage(const XML_Char *prog, int rc)
{
ftprintf(stderr,
- T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] "
+ T("usage: %s [-s] [-n] [-p] [-x] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [-v] "
"[-e encoding] file ...\n"), prog);
exit(rc);
}

@ -1 +1,2 @@
DIST grantlee-0.3.0.tar.gz 1132163 SHA256 fb7ebcc9beb5f74077a5e2fb4e9893d280dd3346e7f5f58155f0dcc9a2e25f30 SHA512 bde5790c223aa34738b5092c2c1e91715f9d503fc584ad2ec33ee0ab870a4c35aeea63a3a9f429ed55df12d4d538b2903ad10a9fb71dc15fb592693a2b84acae WHIRLPOOL ac284835e447c8baa76eace1154ba9ce42d0f01e63616d515a6b8be36ec6f8eea7f5e42e81bb221b29c604e6fc069c2451488484b16aa7ac4b64abd038f0057f
DIST grantlee-0.4.0.tar.gz 1171445 SHA256 13a2d8121392404bb3be4ed470b211bc098cd98da795ef7bf41517d2fb640d3f SHA512 6ff539eb7aaf366487214b02131d67b9967713c42d20314ff56129e9543516fdf2d129b9c3015f0959c89c6f0ee9ad085af91fed4293bd0613d8e888bc850ca7 WHIRLPOOL ee639a72c6f785559b427a2f13483c256e19dbeb270ff34118a81547ea1f31a69aeaed7c58a2d89952b79d58e3acc88ef44f06cac32739747c7920ef66d621b0

@ -0,0 +1,54 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.4.0.ebuild,v 1.1 2014/02/05 17:16:43 kensington Exp $
EAPI=5
inherit cmake-utils
DESCRIPTION="C++ string template engine based on the Django template system"
HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="debug doc test"
RDEPEND="
dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtscript:4
"
DEPEND="${RDEPEND}
doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
test? ( dev-qt/qttest:4 )
"
# Some tests fail
RESTRICT="test"
DOCS=( AUTHORS CHANGELOG GOALS README )
PATCHES=(
"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
)
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_build test TESTS)
)
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
use doc && cmake-utils_src_compile docs
}
src_install() {
use doc && HTML_DOCS=( "${BUILD_DIR}/apidox/" )
cmake-utils_src_install
}

@ -0,0 +1,59 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgpg-error/libgpg-error-1.12-r1.ebuild,v 1.1 2014/02/06 00:22:51 radhermit Exp $
EAPI=5
inherit eutils libtool multilib-minimal
DESCRIPTION="Contains error handling functions used by GnuPG software"
HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
abi_x86_32? (
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
!<=app-emulation/emul-linux-x86-baselibs-20131008-r12
)"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
src_prepare() {
epatch_user
elibtoolize
}
multilib_src_configure() {
local myeconfargs=(
$(use_enable nls)
$(use_enable static-libs static)
$(use_enable common-lisp languages)
)
multilib_build_binaries || myeconfargs+=(
--disable-languages
)
ECONF_SOURCE=${S} \
econf "${myeconfargs[@]}"
}
multilib_src_install() {
default
mv "${ED}"/usr/bin/{,"${CHOST}"-}gpg-error-config || die
if multilib_build_binaries; then
dosym "${CHOST}"-gpg-error-config /usr/bin/gpg-error-config
fi
}
multilib_src_install_all() {
einstalldocs
# library has no dependencies, so it does not need the .la file
prune_libtool_files --all
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/astropy/astropy-0.3.ebuild,v 1.1 2013/11/26 18:03:32 bicatali Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/astropy/astropy-0.3.ebuild,v 1.2 2014/02/05 23:50:45 bicatali Exp $
EAPI=5
@ -23,10 +23,7 @@ RDEPEND="
sci-astronomy/erfa
sci-astronomy/wcslib
sci-libs/cfitsio
sys-libs/zlib
!dev-python/pyfits
!dev-python/pywcs
!dev-python/vo"
sys-libs/zlib"
DEPEND="${RDEPEND}
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]

@ -1,2 +1 @@
DIST ATpy-0.9.6.tar.gz 479534 SHA256 76db098f1afa0324073d24de713fc049a92c199ed7a8edeeccc5f05ea15a4fd4 SHA512 94997d1dad7368e4459a89336c6df19b3566ae285e9a3108bdd352fea53199836998d121407a047dca709f50379e13c344006c7da6f6cee2b8008afa48176f7c WHIRLPOOL b5e37ebad5cd882ad26959f98ae9b22f2fcaacb630e3e35020f89ffb6da45d50cdb30c786abfe35aa2bebc938561977a7519d4007bebada13aa3977fbcab0359
DIST ATpy-0.9.7.tar.gz 663163 SHA256 4286bb0e4de30df16d6ffd14eb92e4bd47cba2b486834ca95db512c830d0693c SHA512 4cd078625fd4fc83d267cf3aff4728ec8b2de927dd0a748dba47030216b141aa0c266f34bbf708211ec829a363b3b8e5eed36bf538efbe170ae316a271b36bb4 WHIRLPOOL 6e86375725c203b5351c0111a5e10fa6905c9add682b26275f2538e97e3e1b16884c40794809b0b02a0e4f64bd1f3f5d56f474ef5efc5bbd8622dcd639360ecc

@ -1,37 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/atpy/atpy-0.9.6-r1.ebuild,v 1.1 2013/04/24 22:45:29 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1
MYPN=ATpy
MYP="${MYPN}-${PV}"
DESCRIPTION="Astronomical tables support for Python"
HOMEPAGE="http://atpy.github.com"
SRC_URI="mirror://github/${PN}/${PN}/${MYP}.tar.gz"
DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
dev-python/asciitable[${PYTHON_USEDEP}]
fits? ( virtual/pyfits[${PYTHON_USEDEP}] )
hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
postgres? ( dev-db/pygresql )
votable? ( virtual/pyvo[${PYTHON_USEDEP}] )"
IUSE="+fits hdf5 mysql postgres sqlite +votable"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-3"
S="${WORKDIR}/${MYP}"
python_test() {
PYTHONPATH="${BUILD_DIR}/lib" "${EPYTHON}" test/unittests.py || die
}

@ -1,45 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/atpy/atpy-0.9.6.ebuild,v 1.2 2013/01/15 23:15:17 mgorny Exp $
EAPI="2"
PYTHON_DEPEND="2:2.6"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
PYTHON_USE_WITH=sqlite
PYTHON_USE_WITH_OPT=sqlite
inherit distutils
MYPN=ATpy
MYP="${MYPN}-${PV}"
DESCRIPTION="Astronomical tables support for Python"
HOMEPAGE="http://atpy.github.com/ http://pypi.python.org/pypi/ATpy"
SRC_URI="mirror://github/${PN}/${PN}/${MYP}.tar.gz"
RDEPEND="dev-python/numpy
dev-python/asciitable
fits? ( dev-python/pyfits )
hdf5? ( dev-python/h5py )
mysql? ( dev-python/mysql-python )
postgres? ( dev-db/pygresql )
votable? ( dev-python/vo )"
DEPEND=">=dev-python/numpy-1.3"
IUSE="+fits hdf5 mysql postgres sqlite +votable"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-3"
S="${WORKDIR}/${MYP}"
src_test() {
testing() {
PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test/unittests.py
}
python_execute_function testing
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/atpy/atpy-0.9.7.ebuild,v 1.2 2013/09/10 03:05:34 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/atpy/atpy-0.9.7.ebuild,v 1.3 2014/02/05 23:36:16 bicatali Exp $
EAPI=5
@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
postgres? ( dev-db/pygresql )"
IUSE="+fits hdf5 mysql postgres sqlite +votable"
IUSE="hdf5 mysql postgres sqlite"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-3"

@ -13,14 +13,6 @@
supported are FITS, VO, IPAC. Database supported are SQLite, MySQL
and PostgreSQL.
</longdescription>
<use>
<flag name="fits">
Enable support for reading and FITS with <pkg>dev-python/pyfits</pkg>.
</flag>
<flag name="votable">
Enable support for reading and VOTABLE with <pkg>dev-python/vo</pkg>.
</flag>
</use>
<upstream>
<remote-id type="pypi">ATpy</remote-id>
</upstream>

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/blinker/blinker-1.3.ebuild,v 1.3 2013/09/30 15:32:29 floppym Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/blinker/blinker-1.3.ebuild,v 1.4 2014/02/06 05:36:04 bicatali Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"

@ -0,0 +1 @@
DIST blosc-1.2.0.tar.gz 221882 SHA256 d740c1bd6440c5fd7203006538b6c626361fba705ce9ce8f36c400ddb2f50fec SHA512 85db692d3a68ebeacaaf3759807c386e05a13fbad873379d13fc2f2b7470929a3e6cbe7f37c952740e412eecb2cb83bed194e0f4f7af1ef2c934d5478cd93ce1 WHIRLPOOL aa81df21b15382f388fe746a7f9ab0f2ec9eaf82c56bcbd19edb03fb73ce527c6ff70d30461440e27a4292fcdb9f1d43ce039a3a6c2d9b0101f1a4441d2e1a61

@ -0,0 +1,34 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/blosc/blosc-1.2.0.ebuild,v 1.1 2014/02/06 01:24:11 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
inherit distutils-r1
DESCRIPTION="High performance compressor optimized for binary data"
HOMEPAGE="http://blosc.pydata.org/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-libs/c-blosc"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
python_prepare_all() {
# remove forced sse2
sed -i "s|CFLAGS\.append(\"-msse2\")|pass|" setup.py || die
distutils-r1_python_prepare_all
}
python_test() {
cd "${BUILD_DIR}"/lib || die
nosetests -v || die
}

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci</herd>
<longdescription lang="en">
blosc is a high performance compressor optimized
for binary data. It has been designed to transmit data to the
processor cache faster than the traditional, non-compressed, direct
memory fetch approach via a memcpy() OS call.
Blosc works well for compressing numerical arrays that contains data
with relatively low entropy, like sparse data, time series, grids with
regular-spaced values, etc.
python-blosc a Python package that wraps Blosc.
</longdescription>
<upstream>
<remote-id type="pypi">blosc</remote-id>
</upstream>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/colorama/colorama-0.2.7.ebuild,v 1.3 2014/01/14 14:00:15 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/colorama/colorama-0.2.7.ebuild,v 1.4 2014/02/06 06:41:22 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@ -14,5 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.10.1-r1.ebuild,v 1.1 2013/08/16 09:07:32 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.10.1-r1.ebuild,v 1.2 2014/02/06 05:41:30 bicatali Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_3} )
@ -15,7 +15,7 @@ HOMEPAGE="http://pypi.python.org/pypi/Flask"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]

@ -1 +1,2 @@
DIST gevent-websocket-0.3.6.tar.gz 11462 SHA256 1806bd1e78cfbd6f5b38e00c6b6f5a5ed0015b1eee94f78adba62d199c23ad6d SHA512 277a818955e3c672a06db31aed8b11ec82aefd67ea2389c1feeb555de074e177d340b34c7236f787a6af9b52eac5af02c7831285d8a067105659f0e1293ee49c WHIRLPOOL 2f6bee200ac5b9b2c0f18d5bea40bc75dfa60550b6cf82dbc9d5d07529221fb3ca8d4953965ae609e189bc3553a4a5be063d548ddbfc2cbe32228f1a24c44d4b
DIST gevent-websocket-0.9.2.tar.gz 16404 SHA256 091f7fdf3c288d353f381d5660efbf14586099ef3a17f3579370905ce4ff0b13 SHA512 8d564eb73148571508c916823e2e25ed4a264613acfd70e5d810195be9572366badee85fe652f486c5841d4231944ff9ed0b233687085df9eb86a83ef3a27985 WHIRLPOOL 504aee80abf6493a30616bdaae4d8aceefc1d0bdf67eda9bad78dbb683b5df132738164cc64410c8cec2c2269e78f078e68ae3e01dc902d5df2357db8401d73c

@ -0,0 +1,23 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-websocket/gevent-websocket-0.9.2.ebuild,v 1.1 2014/02/06 05:57:53 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1
DESCRIPTION="Websocket handler for the gevent pywsgi server"
HOMEPAGE="http://pypi.python.org/pypi/gevent-websocket/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
dev-python/gevent[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]"

@ -1,17 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
<herd>proxy-maintainers</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Ultrabug</name>
<description>main maintainer</description>
</maintainer>
<maintainer>
<email>julien@thebault.co</email>
<name>Lujeni</name>
<description>Proxy Maintainer. CC on bugs</description>
</maintainer>
<longdescription>Websocket handler for the gevent pywsgi server</longdescription>
<herd>python</herd>
<herd>proxy-maintainers</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Ultrabug</name>
<description>main maintainer</description>
</maintainer>
<maintainer>
<email>julien@thebault.co</email>
<name>Lujeni</name>
<description>Proxy Maintainer. CC on bugs</description>
</maintainer>
<longdescription>
Websocket handler for the gevent pywsgi server
</longdescription>
<upstream>
<remote-id type="pypi">gevent-websocket</remote-id>
</upstream>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent/gevent-1.0.ebuild,v 1.1 2013/11/26 17:18:46 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent/gevent-1.0.ebuild,v 1.2 2014/02/06 05:48:14 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@ -17,7 +17,7 @@ SRC_URI="https://github.com/surfly/${PN}/releases/download/${MY_PV}/${MY_P}.tar.
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
RDEPEND="dev-libs/libev

@ -1,4 +1,2 @@
DIST graph-tool-2.2.21.tar.bz2 29557399 SHA256 0b5bb9c4c980f385a88c07c5d0254b780340244f723a065eb04347584ca86696 SHA512 3664a0b3428918a6caced12e95005cb647ee96d1cf0aa6e64ed6d7a5c41f8dba5f019adbf28d521015b8099f55a7f16fcc4b981250f4931b33eac6208e2a373f WHIRLPOOL d70824f999e61b44c44c94c9b5a74233acbaaa857715ef9e8b7406661be7ca8d895ea3a55bf22c819aa046af8718ade84f6603597a4453e49217b57a75842b6c
DIST graph-tool-2.2.22.tar.bz2 29564502 SHA256 c889466c82e972688bb2b477a9ab2af9900b8c80451630a275ed0eca34180715 SHA512 2d8326f9acf1fcc4b3c5d6d6dd8ef7a8f880458e57767b8b75b4930d28ab84a264b16fa8b26ffae0e143055e302ebfb6f6ad3f3fef850ac7c5ba9ea14ba09d20 WHIRLPOOL b15aaf7e18766fea9f03ee892c1dd28eb1697e037e8feb600ba9b16cf4714ab9b4f67515402f766f803aef17346a41e4678d9bcc7e08dc69dac5f742d8b02455
DIST graph-tool-2.2.23.tar.bz2 29575286 SHA256 228c9b19f0e7aef512fdb6638cf1366014ad5a69d860f5ab26a278a4fb5094b2 SHA512 851642e9042fd32f830653f56a9f6ef7bb5fc38dcbe72e57554dc17c99f56bd98ef3bf77cc0865248c442b8f3a18c965d43f771921bcd40f75b2dad3bbd08608 WHIRLPOOL cab4b96e66683db8443be552b64d2ccaec667a2888765f03502e9e628f3b07caf6acb7283f5c6549ec720c09f1233d659f3258d50716c679cf8cfdc109d37451
DIST graph-tool-2.2.24.tar.bz2 29594367 SHA256 56e5ab1ba7c8eff19c2096e90da212e5e2bf7cd9a9430dc52a8426fdc1c05171 SHA512 c36a03d36e39d7ce1e40e2c8dc7b7baf0a4a5f5f3876208576cebb192f11b201c4559a3b99271e96e2eceddb339e31cf99a28aa58f059ce22037c11af4bdc8fb WHIRLPOOL c7ecc9254fcf40a61559ef0493b88096dcea28356055c525df6058f2e5c04b2ee7492b5ab31ea677d4f97df45013e86a9a68cb105951e7344b069ad53eea1fa3
DIST graph-tool-2.2.28.tar.bz2 29643913 SHA256 fa6c46aee82302e3366c7f8f2a4028fcbac4f7ebcc4d05739b9e4e266b418999 SHA512 4e4cbd2ec5c780b5d0e74de51e390c7a6d409371e79ed828a62d87f5183600f8553428e16e13674f9311af471346aeb96b84dff2154ce8b5cf1f835cd1c468fe WHIRLPOOL dd69f2980f654d55f3e45ef8e9a5dd3bace9aef13fb1c21bfaa779b70c94a620a2613af96310b5ab34e996795a471445b067ab07d7801c0ab8fbfa60a5994a95
DIST graph-tool-2.2.29.tar.bz2 29644025 SHA256 9d988ba684404197c7193891ff83e801334528cf540313d63b9d7f71fe06c813 SHA512 dc09da1f7d299ce3bebb2eb5e9f1d2434bcdfb792c853cee26b524b166db617c51e53303adfab4a0b21f041c2eae7932140fac0c54b474caa91a23bdb4fb0cea WHIRLPOOL 442dfb8df3c607e08640c7644acaaee5d144f81e031273141aef3f3fd65fe272640646e83b69c6172f6b7c3eb22a50541d8b5a6e8f7195fb64278bcbf6b8054c

@ -1,85 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.21.ebuild,v 1.3 2013/02/10 11:06:44 radhermit Exp $
EAPI=5
# python3 dropped until scipy reinstates support
PYTHON_COMPAT=( python2_7 )
inherit check-reqs eutils toolchain-funcs python-r1
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.skewed.de/graph-tool"
inherit git-2
else
SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
HOMEPAGE="http://graph-tool.skewed.de/"
LICENSE="GPL-3"
SLOT="0"
IUSE="+cairo openmp"
CDEPEND=">=dev-libs/boost-1.46.0[python]
dev-libs/expat
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
sci-mathematics/cgal
cairo? (
dev-cpp/cairomm
dev-python/pycairo[${PYTHON_USEDEP}]
)"
RDEPEND="${CDEPEND}
dev-python/matplotlib[${PYTHON_USEDEP}]
media-gfx/graphviz[python]"
DEPEND="${CDEPEND}
dev-cpp/sparsehash
virtual/pkgconfig"
# most machines don't have enough ram for parallel builds
MAKEOPTS="${MAKEOPTS} -j1"
# bug 453544
CHECKREQS_DISK_BUILD="6G"
pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
check-reqs_pkg_pretend
}
src_prepare() {
>py-compile
python_copy_sources
}
src_configure() {
python_foreach_impl run_in_build_dir \
econf \
--disable-static \
--disable-optimization \
$(use_enable openmp) \
$(use_enable cairo)
}
src_compile() {
python_foreach_impl run_in_build_dir default
}
src_install() {
python_foreach_impl run_in_build_dir default
prune_libtool_files --modules
# remove unwanted extra docs
rm -r "${ED}"/usr/share/doc/${PN} || die
}
run_in_build_dir() {
pushd "${BUILD_DIR}" > /dev/null
"$@"
popd > /dev/null
}

@ -1,85 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.23.ebuild,v 1.1 2013/03/23 17:51:29 radhermit Exp $
EAPI=5
# python3 dropped until scipy reinstates support
PYTHON_COMPAT=( python2_7 )
inherit check-reqs eutils toolchain-funcs python-r1
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.skewed.de/graph-tool"
inherit git-2
else
SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
HOMEPAGE="http://graph-tool.skewed.de/"
LICENSE="GPL-3"
SLOT="0"
IUSE="+cairo openmp"
CDEPEND=">=dev-libs/boost-1.46.0[python]
dev-libs/expat
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
sci-mathematics/cgal
cairo? (
dev-cpp/cairomm
dev-python/pycairo[${PYTHON_USEDEP}]
)"
RDEPEND="${CDEPEND}
dev-python/matplotlib[${PYTHON_USEDEP}]
media-gfx/graphviz[python]"
DEPEND="${CDEPEND}
dev-cpp/sparsehash
virtual/pkgconfig"
# most machines don't have enough ram for parallel builds
MAKEOPTS="${MAKEOPTS} -j1"
# bug 453544
CHECKREQS_DISK_BUILD="6G"
pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
check-reqs_pkg_pretend
}
src_prepare() {
>py-compile
python_copy_sources
}
src_configure() {
python_foreach_impl run_in_build_dir \
econf \
--disable-static \
--disable-optimization \
$(use_enable openmp) \
$(use_enable cairo)
}
src_compile() {
python_foreach_impl run_in_build_dir default
}
src_install() {
python_foreach_impl run_in_build_dir default
prune_libtool_files --modules
# remove unwanted extra docs
rm -r "${ED}"/usr/share/doc/${PN} || die
}
run_in_build_dir() {
pushd "${BUILD_DIR}" > /dev/null
"$@"
popd > /dev/null
}

@ -1,10 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.24.ebuild,v 1.1 2013/06/04 21:13:27 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.28.ebuild,v 1.1 2014/02/05 18:41:16 radhermit Exp $
EAPI=5
# python3 missing from graphviz
PYTHON_COMPAT=( python2_7 )
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
inherit check-reqs eutils toolchain-funcs python-r1
@ -23,18 +22,18 @@ LICENSE="GPL-3"
SLOT="0"
IUSE="+cairo openmp"
CDEPEND=">=dev-libs/boost-1.46.0[python,${PYTHON_USEDEP}]
CDEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.46.0[python,${PYTHON_USEDEP}]
dev-libs/expat
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
sci-mathematics/cgal
>=sci-mathematics/cgal-3.5
cairo? (
dev-cpp/cairomm
dev-python/pycairo[${PYTHON_USEDEP}]
)"
RDEPEND="${CDEPEND}
dev-python/matplotlib[${PYTHON_USEDEP}]
media-gfx/graphviz[python,${PYTHON_USEDEP}]"
dev-python/matplotlib[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-cpp/sparsehash
virtual/pkgconfig"

@ -1,10 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.22.ebuild,v 1.1 2013/03/02 08:59:30 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.29.ebuild,v 1.1 2014/02/05 19:51:32 radhermit Exp $
EAPI=5
# python3 dropped until scipy reinstates support
PYTHON_COMPAT=( python2_7 )
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
inherit check-reqs eutils toolchain-funcs python-r1
@ -23,18 +22,18 @@ LICENSE="GPL-3"
SLOT="0"
IUSE="+cairo openmp"
CDEPEND=">=dev-libs/boost-1.46.0[python]
CDEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.46.0[python,${PYTHON_USEDEP}]
dev-libs/expat
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
sci-mathematics/cgal
>=sci-mathematics/cgal-3.5
cairo? (
dev-cpp/cairomm
dev-python/pycairo[${PYTHON_USEDEP}]
)"
RDEPEND="${CDEPEND}
dev-python/matplotlib[${PYTHON_USEDEP}]
media-gfx/graphviz[python]"
dev-python/matplotlib[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-cpp/sparsehash
virtual/pkgconfig"
@ -58,7 +57,7 @@ src_prepare() {
}
src_configure() {
python_foreach_impl run_in_build_dir \
python_parallel_foreach_impl run_in_build_dir \
econf \
--disable-static \
--disable-optimization \
@ -67,11 +66,11 @@ src_configure() {
}
src_compile() {
python_foreach_impl run_in_build_dir default
python_parallel_foreach_impl run_in_build_dir default
}
src_install() {
python_foreach_impl run_in_build_dir default
python_parallel_foreach_impl run_in_build_dir default
prune_libtool_files --modules
# remove unwanted extra docs

@ -1,10 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.5 2013/06/04 21:13:27 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.6 2014/02/05 18:41:16 radhermit Exp $
EAPI=5
# python3 missing from graphviz
PYTHON_COMPAT=( python2_7 )
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
inherit check-reqs eutils toolchain-funcs python-r1
@ -23,18 +22,18 @@ LICENSE="GPL-3"
SLOT="0"
IUSE="+cairo openmp"
CDEPEND=">=dev-libs/boost-1.46.0[python,${PYTHON_USEDEP}]
CDEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.46.0[python,${PYTHON_USEDEP}]
dev-libs/expat
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
sci-mathematics/cgal
>=sci-mathematics/cgal-3.5
cairo? (
dev-cpp/cairomm
dev-python/pycairo[${PYTHON_USEDEP}]
)"
RDEPEND="${CDEPEND}
dev-python/matplotlib[${PYTHON_USEDEP}]
media-gfx/graphviz[python,${PYTHON_USEDEP}]"
dev-python/matplotlib[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-cpp/sparsehash
virtual/pkgconfig"

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.23.ebuild,v 1.1 2014/01/25 09:52:29 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.23.ebuild,v 1.2 2014/02/06 05:38:17 bicatali Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.3.1.ebuild,v 1.12 2013/12/23 16:00:13 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.3.1.ebuild,v 1.13 2014/02/06 06:01:32 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
IUSE="doc test pygments"
DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"

@ -1,3 +1 @@
DIST pyds9-1.5.tar.gz 2001781 SHA256 8f68a3b5a20a94d674553f2d9724d9c53a1ca1611a66dfb5665054c2091dd76d SHA512 cb3f7e8093d30746d8dce9619a7b4878542d85a327667a8a01b7f32775348116f97e9cb04fddc91366683251d94a045c96636c62a58f54cf25e458b5752bdb7f WHIRLPOOL 4ff41938fb9e3690cf65e287240eca319d35db7e2c33695377da6472d5493c9f743017ecabf7b045494b2a6a8faaa229bd45934d9f19548d303c42ce883bbbd8
DIST pyds9-1.6.tar.gz 2016740 SHA256 649cb52b9dfa8492f7409733d143562dd0396f6e50d5bdabe9e944ff10956bd7 SHA512 d074a7ff2aace3b8d7eb6c3b720850013f77164b697e227771350c6be641ef54d0990b9a934dd7c18c860fec88066e30171afaa8c53e4c328e8d0a33fd1fc22f WHIRLPOOL 3266b5a48d89ca5d585fb5e1d55c05df256e32685aff44b733e6d43d6f95692db4ac9204d2c3b0d300ca309df26a1a1a47fea0e5a867888adb86da0499eb49ad
DIST pyds9-1.7.tar.gz 879882 SHA256 026a86827fa93f074e2a90b9d831ba79253f312fa331f6a6a508cfa91fa81aac SHA512 8622cf40db65228553abc2f3dea346d9c948706a2681217a9383589d4df0143c42ef859dff12689f699b0fb40806945232c336539f37eb2c78754f9779043bcb WHIRLPOOL abc2d11817519e844f61319b0ba30276a9bb48b6a3beb5e6b7c097717cc86aeeb1960f58d62a21a9ce5d4bc37c05b8cee181abc1cc12e2821a5e878d64f1f175

@ -1,42 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/pyds9-1.5.ebuild,v 1.1 2012/08/21 11:55:00 xarthisius Exp $
EAPI=3
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
inherit distutils multilib
DESCRIPTION="Python interface to XPA to communicate with DS9"
HOMEPAGE="http://hea-www.harvard.edu/saord/ds9/pyds9/"
SRC_URI="http://hea-www.harvard.edu/saord/download/ds9/python/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="x11-libs/xpa"
RDEPEND="${DEPEND}
dev-python/numpy
dev-python/pyfits"
DOCS="changelog README"
src_prepare() {
rm -rf xpa-*
sed -i \
-e "/py_modules/s|\],|\])|" \
-e '/data_files/,$ d' \
setup.py || die
sed -i \
-e "s|./xpa-2.1.12|${EROOT}/usr/$(get_libdir)|" \
xpa.py || die
sed -i \
-e "s|sys.path|${EROOT}/usr/bin|" \
ds9.py || die
distutils_src_prepare
}

@ -1,41 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/pyds9-1.6.ebuild,v 1.2 2013/04/24 21:20:51 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1 multilib
XPAPV=2.1.14
DESCRIPTION="Python interface to XPA to communicate with DS9"
HOMEPAGE="http://hea-www.harvard.edu/RD/ds9/pyds9/"
SRC_URI="http://hea-www.harvard.edu/RD/download/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=">=x11-libs/xpa-${XPAPV}"
RDEPEND="${DEPEND}
dev-python/numpy[${PYTHON_USEDEP}]
virtual/pyfits[${PYTHON_USEDEP}]"
DOCS=(changelog README)
src_prepare() {
rm -r xpa-${XPAPV} || die
sed -i \
-e "/py_modules/s|\],|\])|" \
-e '/data_files/,$ d' \
setup.py || die
sed -i \
-e "s|./xpa-${XPAPV}|${EROOT}/usr/$(get_libdir)|" \
xpa.py || die
sed -i \
-e "s|sys.path|${EROOT}/usr/bin|" \
ds9.py || die
distutils-r1_src_prepare
}

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/pyds9-1.7.ebuild,v 1.1 2014/01/17 22:13:23 bicatali Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/pyds9-1.7.ebuild,v 1.2 2014/02/05 23:40:42 bicatali Exp $
EAPI=5
@ -21,7 +21,8 @@ IUSE=""
DEPEND=">=x11-libs/xpa-${XPAPV}"
RDEPEND="${DEPEND}
dev-python/numpy[${PYTHON_USEDEP}]
virtual/pyfits[${PYTHON_USEDEP}]"
|| ( dev-python/astropy[${PYTHON_USEDEP}]
dev-python/pyfits[${PYTHON_USEDEP}] )"
DOCS=(changelog README)

@ -1,3 +1,3 @@
DIST pyfits-2.4.0.tar.gz 284236 SHA256 40c21106b86ad01264780409ecb2c8102e80c3eaf2085224f370fc7b3b07ea22 SHA512 cdbcf8b4e178cde8723eb9386a52e59c9d66462479491d0b0ae1d436c91cc476748c00e837477acf9a46791cd4a7517ff649434c33c225ba8a396148e4485fa1 WHIRLPOOL 2c22a63bd180ad68bf3001d539c403147eecc01dc5537f9c1b0be582c79dd87297f91f33809dec6c9f5906396d409af5b4495ef0b68fe6cc03d816a51a286e50
DIST pyfits-3.1.1.tar.gz 775299 SHA256 5c87a050dc9ea8c1572c09f8ab46f59cc77b7b11cd7d41af35ae46939e32813a SHA512 9fe25a4d92245e07cab2a8bdc490a9bad3ad0f4f9f2e8d24e93710fe2bdf4d98f0a7167a23396861637c6ec6df25c3d306f678edc922f6aac5a6412f06de4147 WHIRLPOOL f45851f9a506d6245f1aa1f69c513430744f771c4e808050b3f8aa24f3450d735ebc18204bf5e6a16d8288f1479b8658887c8a689d605ac4bbdaa57475912cb4
DIST pyfits-3.1.2.tar.gz 790908 SHA256 f0e41b5c2db37d97ccb05d2057ece8fd1d18804722707114b5cd34beb736d2f0 SHA512 a73a2dabe2148b538aa12e685dc2fdd3d7c46c0e971e6d2e9793d41de8e30aad3171c955fc403a00717462987b0fb32b5b67ccd5baedf147ad21b419db512b53 WHIRLPOOL b5ca58c106fc13db0fc2d707946736e7d26576efea7d2dcd9606afdbee6020c582da618efa13397ddcfa56596b08a8ade5ac78b0a4326288132924bbc72655a1
DIST pyfits-3.2.tar.gz 1606650 SHA256 1e049191f64f396e67603c507b63e7c0fc442eafddddc35a6e10244ad16dae42 SHA512 0942dd327608c22e828d227a1126f360df19456ba26914afa57a1a847a4dfec90954224f48e782dc458cda6d7a045beed0d9c0b750ebcebe4a56dc3b54f86494 WHIRLPOOL e07d476d9ba193cc94d51a5dd59231ea7368c80b7f2462f1154c55f4d426bf2e7ea1f8b174457747a25e0f983ccfae96a0c8c009a181dab4eb3b12d33e21bb46

@ -0,0 +1,97 @@
--- pyfits-3.2.orig/setup.cfg 2014-02-05 14:11:01.244895447 -0800
+++ pyfits-3.2/setup.cfg 2014-02-05 14:28:44.175030178 -0800
@@ -36,91 +36,12 @@
[extension=pyfits.compression]
sources =
- cextern/cfitsio/adler32.c
- cextern/cfitsio/buffers.c
- cextern/cfitsio/cfileio.c
- cextern/cfitsio/checksum.c
- cextern/cfitsio/crc32.c
- cextern/cfitsio/deflate.c
- cextern/cfitsio/drvrfile.c
- cextern/cfitsio/drvrgsiftp.c
- cextern/cfitsio/drvrmem.c
- cextern/cfitsio/drvrnet.c
- cextern/cfitsio/drvrsmem.c
- cextern/cfitsio/editcol.c
- cextern/cfitsio/edithdu.c
- cextern/cfitsio/eval_f.c
- cextern/cfitsio/eval_l.c
- cextern/cfitsio/eval_y.c
- cextern/cfitsio/fitscore.c
- cextern/cfitsio/fits_hcompress.c
- cextern/cfitsio/fits_hdecompress.c
- cextern/cfitsio/getcolb.c
- cextern/cfitsio/getcol.c
- cextern/cfitsio/getcold.c
- cextern/cfitsio/getcole.c
- cextern/cfitsio/getcoli.c
- cextern/cfitsio/getcolj.c
- cextern/cfitsio/getcolk.c
- cextern/cfitsio/getcoll.c
- cextern/cfitsio/getcolsb.c
- cextern/cfitsio/getcols.c
- cextern/cfitsio/getcolui.c
- cextern/cfitsio/getcoluj.c
- cextern/cfitsio/getcoluk.c
- cextern/cfitsio/getkey.c
- cextern/cfitsio/group.c
- cextern/cfitsio/grparser.c
- cextern/cfitsio/histo.c
- cextern/cfitsio/imcompress.c
- cextern/cfitsio/infback.c
- cextern/cfitsio/inffast.c
- cextern/cfitsio/inflate.c
- cextern/cfitsio/inftrees.c
- cextern/cfitsio/iraffits.c
- cextern/cfitsio/modkey.c
- cextern/cfitsio/pliocomp.c
- cextern/cfitsio/putcolb.c
- cextern/cfitsio/putcol.c
- cextern/cfitsio/putcold.c
- cextern/cfitsio/putcole.c
- cextern/cfitsio/putcoli.c
- cextern/cfitsio/putcolj.c
- cextern/cfitsio/putcolk.c
- cextern/cfitsio/putcoll.c
- cextern/cfitsio/putcolsb.c
- cextern/cfitsio/putcols.c
- cextern/cfitsio/putcolu.c
- cextern/cfitsio/putcolui.c
- cextern/cfitsio/putcoluj.c
- cextern/cfitsio/putcoluk.c
- cextern/cfitsio/putkey.c
- cextern/cfitsio/quantize.c
- cextern/cfitsio/region.c
- cextern/cfitsio/ricecomp.c
- cextern/cfitsio/scalnull.c
- cextern/cfitsio/swapproc.c
- cextern/cfitsio/trees.c
- cextern/cfitsio/uncompr.c
- cextern/cfitsio/wcssub.c
- cextern/cfitsio/wcsutil.c
- cextern/cfitsio/zcompress.c
- cextern/cfitsio/zuncompress.c
- cextern/cfitsio/zutil.c
src/compressionmodule.c
include_dirs =
numpy
- cextern/cfitsio
-extra_compile_args =
- -Wno-unused-variable
- -Wno-parentheses
- -Wno-uninitialized
- -Wno-format
- -Wno-strict-prototypes
- -Wno-unused
- -Wno-comments
- -Wno-switch
-optional = True
+libraries =
+ cfitsio
+optional = False
fail_message =
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Failed to build PyFITS tile compression support. PyFITS will still

@ -1,32 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.1-r1.ebuild,v 1.2 2013/09/05 18:46:59 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1 eutils
DESCRIPTION="Provides an interface to FITS formatted files under python"
HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
!dev-python/astropy"
DEPEND="${RDEPEND}
dev-python/stsci-distutils[${PYTHON_USEDEP}]
dev-python/d2to1[${PYTHON_USEDEP}]"
PATCHES=( "${FILESDIR}"/${PN}-3.0.8-debundle_zlib.patch )
python_test() {
cd "${BUILD_DIR}"/lib* || die
nosetests || die
}

@ -0,0 +1,50 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.2.ebuild,v 1.1 2014/02/05 23:15:46 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
inherit distutils-r1 eutils
DESCRIPTION="Provides an interface to FITS formatted files under python"
HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
!<dev-python/astropy-0.3
sci-libs/cfitsio"
DEPEND="${RDEPEND}
dev-python/d2to1[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/stsci-distutils[${PYTHON_USEDEP}]
doc? (
dev-python/matplotlib
dev-python/numpydoc
dev-python/sphinxcontrib-programoutput
dev-python/stsci-sphinxext
)
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
PATCHES=( "${FILESDIR}"/${P}-unbundle-cfitsio.patch )
python_compile_all() {
use doc && emake -C docs html
}
python_test() {
cd "${BUILD_DIR}"/lib* || die
nosetests || die
}
python_install_all() {
use doc && local HTML_DOCS=( docs/build/html )
distutils-r1_python_install_all
dodoc FAQ.txt CHANGES.txt
}

@ -1,2 +1,3 @@
DIST python-dateutil-1.5.tar.gz 232384 SHA256 c08aca7d85f8f8eed61e83b3423b829262c596a9a78f7ca3de0bcee2217d0e3b SHA512 94191a551822c6b1d3c16523c32ab50aa33c45654e9c8b3d81739305e95dd980e14112be0d7ff92fe226c10fd0e6f5b7d287e86dfddbbdb1a5a5a1ec3ff8c563 WHIRLPOOL bc0b0d29d720d7dcec5ebb701c94aae1a9e76dcafc3ae8552180b22b846c80a37a3efd8b56b22f8cd495ae1cc134df2db0f77d21fec9ec74fc3def6761ad244f
DIST python-dateutil-2.1.tar.gz 152334 SHA256 4c44ec3f9ff057b8c7b4c78beca5fdd8710600ea9a1df42f31bfcbae2f059dee SHA512 017e054f22886814763f6ab0c5c3ee411ce3d59a0d07e26fdf9afdab2500d689aa67a6c4c617b8960755272cb800ff449caedcb180c3a58631ac3cec3ffb89cc WHIRLPOOL f77bb35f5d8706e0909e5e522380f77a8f2bea1f183bdbd8bd41250fc3414730d327ccbab728bf67b5f80e34e672b8d9b346595d1b6c5694bff24a64b43a7454
DIST python-dateutil-2.2.tar.gz 259085 SHA256 eec865307ebe7f329a6a9945c15453265a449cdaaf3710340828a1934d53e468 SHA512 cb278b8e18da3b991c6415ff59e9f3aa87cfb2e52048b3f74a9e3d183e0cc5bf71595123c644d0aea75084e653a885cbfa70c8ddd8b6a888bb13183624fcb46b WHIRLPOOL 545495d466cbea8f750b7e997699e2466131ce780ed73e18a880934a5255f759cee470b6f85a16a44f62bacaad14490e72a212c4cf6e53f0fe69b87492f9d055

@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
<longdescription lang="en">
The dateutil module provides powerful extensions to the standard
datetime module, available in Python 2.3+.
</longdescription>
<herd>python</herd>
<longdescription lang="en">
The dateutil module provides powerful extensions to the standard
datetime module, available in Python 2.3+.
</longdescription>
<upstream>
<remote-id type="pypi">python-dateutil</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,53 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-2.2.ebuild,v 1.1 2014/02/06 06:34:46 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
inherit distutils-r1
DESCRIPTION="Extensions to the standard Python datetime module"
HOMEPAGE="http://labix.org/python-dateutil"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="examples"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]
sys-libs/timezone-data
!<dev-python/python-dateutil-2.1"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
python_prepare_all() {
# Use zoneinfo in /usr/share/zoneinfo.
sed -i -e "s/zoneinfo.gettz/gettz/g" test.py || die
# Fix parsing of date in non-English locales.
sed -e 's/subprocess.getoutput("date")/subprocess.getoutput("LC_ALL=C date")/' \
-i example.py || die
distutils-r1_python_prepare_all
}
python_test() {
"${PYTHON}" test.py || die
}
python_install() {
distutils-r1_python_install
rm -f "${D}$(python_get_sitedir)/dateutil/zoneinfo"/*.tar.*
}
python_install_all() {
distutils-r1_python_install_all
if use examples; then
docinto examples
dodoc example.py sandbox/*.py
fi
}

@ -3,5 +3,6 @@ DIST python-ldap-2.3.9.tar.gz 108209 SHA256 62f75b21c5ee744408c9d8b59878328b3bdf
DIST python-ldap-2.4.10.tar.gz 134153 SHA256 67cc7801bf24c29386ab99966ceb68d6a60fa9e0566cc95a4fbb2c4695a8ce54 SHA512 9f59c87acec4cc8f958c7dbea0ca82aa30f46ef7ff44c5cc424bbc37ccb7a15bf669262ad96e209cdbe4da21e33f46aa85fea736ae76363adb98de915ecac380 WHIRLPOOL c28772aad5d2cfdefc8a6dc9dfe5a29259bdd219038e6e71d2ff35580254e6cb434e5ba485be5eddbc74490012d0046d45ff1d16e222e079b6efabb6f4bcca85
DIST python-ldap-2.4.12.tar.gz 135395 SHA256 8587f8007c603b09ea6aa72fd63f1619b8a0d7f97e81ce955a44e8f84c7c9088 SHA512 9cd5f35d374e1cdd6b01473e978a90478416dec46c566f3a347c44839b54f8a2aa255504acbc88a73e1ad0ac836445546830f28764542b10a6255f890052598e WHIRLPOOL 90bfe55e3ba91cf3bca7e4bf6812d5944a3a311b0652306a836bc2d26bc37882f481775ae713ea540165bcad73e6fe3d5c4634b2b4800e6f3289aea8f72b7681
DIST python-ldap-2.4.13.tar.gz 135550 SHA256 96853b9bbdacb341d6a3d60fdc89f8cb8acef47970ce8492ee3cbe975b9c7dbf SHA512 c77c487b48fa63b9bb9926fca0082834f6a2c6c7e9be89849e59b45a9e7c18146e4a7a982fe0a0504659ba680c39823eea29f349842a9f8df36acf8f10bab975 WHIRLPOOL 0c70cff4f7c41b514befb517fbe89e39bc426bd0fa0b7164781c82d14a99213d6da5d89bba371cdfd5c373d4152cee2f19c19f3e4e65d3aff8e79bcbb41320ae
DIST python-ldap-2.4.14.tar.gz 136808 SHA256 cd2bf964e298a56effeaeb4758c18150c233c6e22b8bdb622cb220a25b53e21d SHA512 77303db1cc14ef0e3d8c40a274db6653edebc1714648d54357a2be2b3dc0a0716ac2950828df5f3968b83058b1e090ef76c148e711645762033b260073a8165b WHIRLPOOL 9deb23d16b18f9ea53028b956bd0d0b79ea26ef3eef45190b05a836770389bd499d2d169ecf01294f9d02499d679b1c62b190adbf4114a0b224e58eabfb77dd6
DIST python-ldap-docs-html-2.3.13.tar.gz 118531 SHA256 8ea9eee3135db006489268733e49ab1e80906ca2bc9e7960f19e548506ce08a4 SHA512 d4edca6b627b4c9449f1ddbda41ae793664924a41b05046b005909002a23cf8e830ab7178cc1173a373f6675e1e97af0e24232baf837ec9fa859888c8c4568f6 WHIRLPOOL f9117dc1bab2368b2976f97437bd03fba3870c5503492e73f1ef9cba4407cf777dbd91dea54f835d8ea4d01e592bb21c59ea7a52b9b8fb4d688915d37163e55e
DIST python-ldap-docs-html-2.3.9.tar.gz 116913 SHA256 de8b4d91e1a35702d993f7d744fcc5a3e7cbf5be543d2d127791cda9df361124 SHA512 fe3259fbbc2620d88912e12d3d7c36776a9f2bc62bdfb704b1ff9671240badaf95bf28e5b93fcf738964f321c02c81f45deb6bb1f49d6d035a0b9990ee9d9279 WHIRLPOOL d85ebb31948c1b5baf7fd49340f1b9239a74c446ebf997e5800c5df7e4db0053ed5df356ea8697adf247b2b5fc34bf5fc92d3903b6f78408eec90b038761e092

@ -0,0 +1,74 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.14.ebuild,v 1.1 2014/02/05 12:36:53 jlec Exp $
EAPI=5
# pypy: bug #458558 (wrong linker options due to not respecting CC)
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1 multilib
DESCRIPTION="Various LDAP-related Python modules"
HOMEPAGE="http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
IUSE="doc examples sasl ssl"
# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
# python team: Please do not remove python-ldap-2.3.9 from the tree.
RDEPEND=">=net-nds/openldap-2.4
dev-python/pyasn1[${PYTHON_USEDEP}]
sasl? ( dev-libs/cyrus-sasl )"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
python_prepare_all() {
sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
-i setup.cfg || die "error fixing setup.cfg"
local mylibs="ldap"
if use sasl; then
use ssl && mylibs="ldap_r"
mylibs="${mylibs} sasl2"
else
sed -e 's/HAVE_SASL//g' -i setup.cfg || die
fi
use ssl && mylibs="${mylibs} ssl crypto"
use elibc_glibc && mylibs="${mylibs} resolv"
sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
-i setup.cfg || die "error setting up libs in setup.cfg"
distutils-r1_python_prepare_all
}
python_compile_all() {
if use doc; then
cd Doc || die
sphinx-build -b html -d _build/doctrees . _build/html || die
fi
}
python_test() {
# XXX: the tests supposedly can start local slapd
# but it requires some manual config, it seems.
"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
}
python_install_all() {
use doc && local HTML_DOCS=( Doc/_build/html/. )
distutils-r1_python_install_all
if use examples; then
dodoc -r Demo
docompress -x /usr/share/doc/${FP}/Demo
fi
}

@ -1,4 +1,5 @@
DIST pytz-2012c.tar.bz2 166864 SHA256 16060ed95f992e3629ce98a5dca5c32c732377ce792f9764f407be7100a9deb1 SHA512 8d142b811c5781e48a66efecb400b9b89fa6e321bc8f4303a29f5b8b3e53b0b5ea54ceb4d639ca612ff0ecd0d44f83010d9988f88aceea8c5805b72252861554 WHIRLPOOL bf1156576e19cd37c7e0336875e5f4003fe1e0e41b0d8f4a6dbd03bb678a34e2ce6260177c4300d6b4ce9bdb186d99dbcc546d90b61117ce91e2e71ae1c0ad0b
DIST pytz-2012j.tar.bz2 214712 SHA256 1fe28ec30c371e3864f4f9b7c9df9bb8351be707b7a128ae4443b0d559d6cbf1 SHA512 52dec29039f415d8b4c6c44994b3d147edcf21fd03a9c065f392417da22bd5b9f966546e13be0014223170a21873f4cdc79a459d298b5546b34a5d66e1ab59c4 WHIRLPOOL cccca26fbcb78379df47d53a9940c8dd79abc402f7f2df1e1688fa670d087868c3aa2cb1ba09873e5d5f97786e08bbf7f4a61e3da64131d93b9e63ad7c3fc256
DIST pytz-2013.9.tar.bz2 159658 SHA256 4252226fa20e0715d4dcd05f9233f0076c44bca30e4f1793b2fe03cdfb422ed4 SHA512 356daf8b3433ab94e16a20188286608c7644ebbd07de09c1602e262133099fd1b7b801f7ea66c8002a822e1da51caebafc7bebd590676c34d169b3bfa7d9635e WHIRLPOOL 00cdb8f1582f2d0410e70f113a33b0879c975d0314cdd75121f78004bb102eaa326c78232950500d8192c4c5a57e3dd4ce660368417b9c112992d01ce96b4848
DIST pytz-2013b.tar.bz2 199509 SHA256 65eb49cc05b7917fddc61e1fe6d8a4512c295cb53891dd5ec816bcccdce3f1a5 SHA512 8600efd8f87c86648ffe7c3625b0567bc0da755f8241c36d4d29f226bfc20577e2b3016bcdc4c36a1d061c58be299d57eeacb0b9caa37c8854364282aaca1cb0 WHIRLPOOL a3434428394ac518fe18d5f4e8847677084d2f0649a9160bd48c96430f69f1e7a58794855633a10d753617c90ef26f129d68bd3874acc50855496183fa244732
DIST pytz-2013d.tar.bz2 204865 SHA256 2407e5b3d69c87915e7b3d86746ca3909153ddee82899b8f5cb70a4fd31b715e SHA512 fc687a2040c40d20cab974b11d18446c761504c3faf81caf0853149fd257aa939e5feb2367006463d443659b4ea7c5a7ef409f9b10329211eb920011ddb8c64f WHIRLPOOL d7411701850a27975b645bce2dcfb4bcfaeef85f12d82a0826372def35ec2495aa06cbdd774efc533114793b09442501f50bea30633a95d85dccff990ae29aea

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
<longdescription lang="en">pytz brings the Olson tz database into Python. This library allows
accurate and cross platform timezone calculations using Python 2.3
or higher. It also solves the issue of ambiguous times at the end of
daylight savings, which you can read more about in the Python
Library Reference (datetime.tzinfo).
Amost all (over 540) of the Olson timezones are supported.</longdescription>
<upstream>
<remote-id type="pypi">pytz</remote-id>
</upstream>
<herd>python</herd>
<longdescription lang="en">
pytz brings the Olson tz database into Python. This library allows
accurate and cross platform timezone calculations using Python 2.3
or higher. It also solves the issue of ambiguous times at the end of
daylight savings, which you can read more about in the Python
Library Reference (datetime.tzinfo).
Amost all (over 540) of the Olson timezones are supported.
</longdescription>
<upstream>
<remote-id type="pypi">pytz</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,33 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2013.9.ebuild,v 1.1 2014/02/06 06:34:39 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
inherit distutils-r1
DESCRIPTION="World timezone definitions for Python"
HOMEPAGE="http://pythonhosted.org/pytz/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=sys-libs/timezone-data-2013i"
RDEPEND="${DEPEND}"
DOCS=( CHANGES.txt )
PATCHES=(
# Use timezone-data zoneinfo.
"${FILESDIR}/${PN}-2009j-zoneinfo.patch"
# ...and do not install a copy of it.
"${FILESDIR}/${PN}-2009h-zoneinfo-noinstall.patch"
)
python_test() {
"${PYTHON}" pytz/tests/test_tzinfo.py
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11-r1.ebuild,v 1.1 2013/04/24 22:42:52 bicatali Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11-r1.ebuild,v 1.2 2014/02/05 23:49:00 bicatali Exp $
EAPI=5
@ -26,7 +26,7 @@ DEPEND="
RDEPEND="
>=sci-astronomy/wcslib-${WCS_V}
virtual/pyfits
!dev-python/astropy"
!<dev-python/astropy-0.3"
# missing data to run tests
RESTRICT=test

@ -1,47 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pywcs/pywcs-1.11.ebuild,v 1.6 2013/04/23 16:00:52 bicatali Exp $
EAPI=4
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.7-pypy-* *-jython 3.3"
inherit distutils eutils
WCS_V=4.8.2
MYP=${P}-${WCS_V}
DESCRIPTION="Python routines for handling the FITS World Coordinate System"
HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib"
SRC_URI="http://stsdas.stsci.edu/astrolib/${MYP}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=sci-astronomy/wcslib-${WCS_V}"
DEPEND="${CDEPEND}
virtual/pkgconfig"
RDEPEND="${CDEPEND}
dev-python/pyfits
!dev-python/astropy"
S=${WORKDIR}/${MYP}
src_prepare(){
epatch "${FILESDIR}"/${P}-wcslib.patch
distutils_src_prepare
}
src_test() {
testing() {
PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
"$(PYTHON)" lib/${PN}/tests/test.py
}
python_execute_function testing
}
#FIX: compiles twice (once during build, another time during install)
# seems to be in the defsetup.py hack script

@ -3,3 +3,4 @@ DIST redis-py-2.7.2.tar.gz 50888 SHA256 c22e7129f21b8bd1690c2cefc07b2caf1088c66a
DIST redis-py-2.7.4.tar.gz 79715 SHA256 623c8d437401314f8ec92f03848638c79c757098b316f0ed40ec2deaad57e082 SHA512 9b8db28c77e9df7a243e510a4f66a021179ab8ff52cfed2cc1b18b20f167eeee138d59a868fc105a32993681551c53e98d45680c16313680e8b4f36b6defa3b9 WHIRLPOOL fa5c754dc83f7d8baea68e21e283435994380e3e7243fa9bdb74ce934f7adacc75a11c6312d4b642606aa817010abc23f8f2a7b9eac1e2c73e50e897085124ad
DIST redis-py-2.7.5.tar.gz 79973 SHA256 6c25b05411014ad11feb4869a8c5e5facc900640c597a288bcd3de6a2ab8948a SHA512 63d8aa506f8b350dd1691efe179371bad093025289f83df5d55ad0a13671153b91858f05b74ff74346da02512333f1da9728a25841a4f2befa5a541054c77eb1 WHIRLPOOL 232b49e91a68a0bcb3c555c8479f6e0104e234f57d54d1fbf716a28dc05de1a0f5b0ccbac2f9e279c9c62380008ad5ec1b2b7acec894ec4f9ec488b8ed92355a
DIST redis-py-2.7.6.tar.gz 76041 SHA256 7e8645a5e1a5e36fb6f93d3113eb078e2763db15aafa3dfa5ba2ceace26a01c4 SHA512 60ec991b35fbfdb9db4bdfc0974f353a2e64d95d758bef81308585c262382bf8080a7d2b7a31211a6b23c9f6fc782b7b62c1909d455d6da87a0efcaa8322e2ed WHIRLPOOL c17f9af68a41332e12d16479ab237a24d43eca4d99919a7cdf760d2e0d6fef92c83a1e45fbaf3029353ee0ac2639edc45dc96088ed3e71fb9bdc02f3ff3c4b09
DIST redis-py-2.9.1.tar.gz 62204 SHA256 af9747ec2727425b1b09252975e21502ee5a3d8d235c7f49869eb13e09ccf4e4 SHA512 6b4912acafb31c87a5bc47b0420834aa9d1eba57feb0bbacdea943b746fe2f24aee4c9f13e7b03ae4edc562043b22c370cc7f53e45be07c5408cfa9852f8ea38 WHIRLPOOL ae38ea63d605f8dd667d9fc548de972bf38d661ae6ef357070ebe7cba3b484febc45d6b7611916d8a1e262e6bbf4754257e727f41af8caa30597954a1fc20cf5

@ -0,0 +1,71 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.9.1.ebuild,v 1.1 2014/02/06 06:13:13 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
inherit distutils-r1
MY_PN="redis"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python client for Redis key-value store"
HOMEPAGE="http://github.com/andymccurdy/redis-py"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-db/redis )"
RDEPEND=""
S="${WORKDIR}/${MY_P}"
python_prepare_all() {
# Disable pubsub and encoding tests, they do not seem to support
# UNIX socket connectivity.
sed -i -e '/PubSub/d' -e '/Encoding/d' \
-e '/use_hiredis:/d' tests/__init__.py || die
# Make sure that tests will be used from BUILD_DIR rather than cwd.
mv tests tests-hidden || die
distutils-r1_python_prepare_all
}
python_compile() {
distutils-r1_python_compile
if use test; then
cp -r tests-hidden "${BUILD_DIR}"/tests || die
fi
}
src_test() {
# local DISTUTILS_NO_PARALLEL_BUILD=1
distutils-r1_src_test
}
python_test() {
local pidfile=${T}/redis-${EPYTHON}.pid
local sock=${T}/redis-${EPYTHON}.sock
sed -i -e "s:port=6379:unix_socket_path=\"${sock}\":" \
"${BUILD_DIR}"/tests/*.py || die
# XXX: find a way to make sure it is killed
"${EPREFIX}"/usr/sbin/redis-server \
--pidfile "${pidfile}" \
--port 0 \
--unixsocket "${sock}" \
--daemonize yes || die
PYTHONPATH="${PYTHONPATH}:${BUILD_DIR}" \
esetup.py test
kill "$(<"${pidfile}")"
}

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-2.2.1.ebuild,v 1.1 2014/01/23 21:22:43 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-2.2.1.ebuild,v 1.2 2014/02/06 06:38:18 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~amd64-linux ~x86-linux"
IUSE=""
# bundles dev-python/urllib3 snapshot

@ -1,43 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.ebuild,v 1.3 2013/04/30 09:44:18 ago Exp $
EAPI="4"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.6"
RESTRICT_PYTHON_ABIS="2.5 3.*"
PYTHON_TESTS_RESTRICTED_ABIS="*-jython *-pypy-*"
DISTUTILS_SRC_TEST="py.test"
inherit distutils
DESCRIPTION="Extension to sphinx to create links to issue trackers"
HOMEPAGE="http://sphinxcontrib-issuetracker.readthedocs.org/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=">=dev-python/requests-0.13
>=dev-python/sphinx-1.1"
DEPEND="${RDEPEND}
dev-python/setuptools
test? (
dev-python/mock
dev-python/pyquery
)"
PYTHON_MODNAME="${PN/-//}"
src_prepare() {
distutils_src_prepare
# test requires network access (bug #425694)
rm tests/test_builtin_trackers.py || die
# Tests from tests/test_stylesheet.py require dev-python/PyQt4[X,webkit]
# and virtualx.eclass.
rm tests/test_stylesheet.py || die
}

@ -0,0 +1 @@
DIST sphinxcontrib-programoutput-0.8.tar.gz 14419 SHA256 1776a03124bab87e35576f7f3992fc21d5bb457321b35e6023eb011dbed10a25 SHA512 9ab769f794cf8c47f2d755b343c1326b8335c1f8161294727abada81af189545d549350536d28ac2c5f27cc309330f875b7affef6f997651e3a9f9dfbe6bd174 WHIRLPOOL a6cf5edfd1ba9926af1327e95cc923147cae3c4d297ddb0ae7577f676c6bcb928b396459113cac3226f74446ea38ee9604722da5b4ddeebeb2f6bc6bc0d5fb52

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
<longdescription>
A Sphinx extension to literally insert the output of arbitrary
commands into documents, helping you to keep your command examples
up to date.
</longdescription>
<upstream>
<remote-id type="pypi">sphinxcontrib-programoutput</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,39 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild,v 1.2 2014/02/06 01:18:24 patrick Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
inherit distutils-r1
DESCRIPTION="Extension to sphinx to include program output"
HOMEPAGE="http://sphinxcontrib-programoutput.readthedocs.org/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND=">=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)"
python_compile_all() {
use doc && emake -C doc html
}
python_test() {
py.test || die
}
python_install_all() {
use doc && local HTML_DOCS=( doc/_build/html )
distutils-r1_python_install_all
}

@ -0,0 +1 @@
DIST stsci.sphinxext-1.2.1.tar.gz 75591 SHA256 17ae92d3ee683b0ac11a0f9a8b3862207aa7790f188147dd0de6a99721776f5a SHA512 98860d6748a6be00a853b12adb283ec138c8111d7c990c5ae7f493089eb5974943aa9fb101ec8b4f280b77c49d07ce6d44c50384477d57710ded0f3382155943 WHIRLPOOL 7a44b4097e1adb88cd8bbc7c900f42702eb8cc9f100239cbdc902ec0be667085bf639c7bd37ca633e33a873edd570fd3f8b624134dd68213d49173de2e701f9d

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
<longdescription>
This project contains extensions to Sphinx to build documentation
from Space Telescope Science Institute.
</longdescription>
<upstream>
<remote-id type="pypi">stsci.sphinxext</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,28 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild,v 1.1 2014/02/05 23:22:34 bicatali Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
MY_PN=${PN/-/.}
MY_P=${MY_PN}-${PV}
inherit distutils-r1
DESCRIPTION="Tools and templates to customize Sphinx for STScI projects"
HOMEPAGE="http://www.stsci.edu/resources/software_hardware/stsci_python"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/numpydoc[python_targets_python2_6?,python_targets_python2_7?]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
S="${WORKDIR}/${MY_P}"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/vo-0.8-r1.ebuild,v 1.1 2013/04/24 19:07:33 bicatali Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/vo-0.8-r1.ebuild,v 1.2 2014/02/05 23:47:37 bicatali Exp $
EAPI=5
@ -20,7 +20,7 @@ LICENSE="BSD"
RDEPEND="
dev-libs/expat
!dev-python/astropy"
!<dev-python/astropy-0.3"
DEPEND="${RDEPEND}"
# slow and buggy tests

@ -1,49 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/vo-0.8.ebuild,v 1.3 2012/08/08 19:13:19 bicatali Exp $
EAPI=4
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython"
inherit distutils eutils
DESCRIPTION="Python module to read VOTABLE into a Numpy recarray"
HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib"
SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz"
IUSE="examples"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="BSD"
RDEPEND="dev-libs/expat
!dev-python/astropy"
DEPEND="${RDEPEND}"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
# missing data to perform tests
RESTRICT="test"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.6-expat.patch
}
src_test() {
cd test
testing() {
PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" \
"$(PYTHON)" benchmarks.py
}
python_execute_function testing
}
src_install() {
distutils_src_install
if use examples; then
insinto /usr/share/doc/${PF}/
doins -r examples
fi
}

@ -2,7 +2,5 @@ DIST minitest-2.12.1.gem 48128 SHA256 e370691de6026cd7c0f7a11d0942ee29502cbed431
DIST minitest-2.8.1.gem 43008 SHA256 1c265730228f63030c136058d6eb15b0bd05edd1e2f0daaf40dbebc4d187de02 SHA512 b08a2cc21cb8d779366964710097582d386bd9eb8d608c4609896f0d1fc2b98eacecdc4142d879c7256824b6c00972b2a2d8f77693d2fea1dea2b05dcd8d5fe4 WHIRLPOOL c394bc7400c97a6d22862740929e0f38e09e713e50f698dddd33f3585fac40345524d9a28cada79c1776f82bd1439cc1a74acf1403e32290c4ff5ddf86073e51
DIST minitest-3.5.0.gem 50688 SHA256 74f1fe409e4e9e9997cd7865bf3e9df9c1452d7abce375120df39bf05e3ddb6e SHA512 1b61f10d9107ca7694d60e9d7ba70ca289fc0c96bdd74e0864b17ca68ec03a154f4791f6d57de6415350adbfb4611b59989ffbcd9cac20289590ae2db411a0cd WHIRLPOOL 43ff247c5e112f4c890afb36669863a6dbb959f35e3ae1f0c0ffdd4e61b36adba8c02dc5eb68c8852232a05447d6ad79156cd6fcd7d7449ae978474fb108c449
DIST minitest-4.7.4.gem 57856 SHA256 0b75963a72a08a60a71f0fd06337e2eea1aaede37961b02305a3b23e1727c662 SHA512 d78cea8a7350127d2c606b98a8695cd866f31a6ff2486385ad16321797363931c5d4b1ead0ac3205c991d4583272cea7c15eee6c31915bf1d46690ed0749f12d WHIRLPOOL 7cbb0ece4264d885cbf8de1c0400a378e159868f52d1022ad9193c38586af418a32278b8795713adfd500c171d2f5271d53b93536ea551f18ada8c79e0672dee
DIST minitest-5.0.6.gem 63488 SHA256 fbcbad8af9fea0e642e40f21a99f61a0c69c561b7a909ac8adce79af3c615d16 SHA512 005e551aef577fd37afd20086301512463a5b216a80285bee7a205cd655f5cd3d8a9c6b085333340138b87d7407f919e9f2d861970bbdf197aa2716b4b8dd909 WHIRLPOOL 31d3ba644c5865a2931b1edbeb9c6a519efa3bb41bfe1f50d901c7ea8b53d2df35717afe40a6cf812a2c4fc4fca5330727aa67db57c260287a106a34af2de9d6
DIST minitest-5.0.7.gem 64000 SHA256 4b386d9f4d437d19c7c6cf2071b5fe452f841d11b0d4a7cbf09c417819632d06 SHA512 7073a2b601ba79f15c98b69817a31aabaf4b368e8632018ca86a9129ce41a396f26cc985cd2df5254a4fc25c793d99a1fffa93294f3b5dd462eb5d10aa16ebb3 WHIRLPOOL b3aa89b17a52d639d2f270b144288e379fac4cfd1dd369b8a1696345d357f2b77d19e3166d816dc84452da379d4db0b1bf82bd487984e0a324c0c82195ddaaa3
DIST minitest-5.0.8.gem 64000 SHA256 78933441f3f5a6b072e22eddf1ee19c7fbc47987e9bd5fa5444e905ad68b3bd8 SHA512 c9a2c160557821d63e0b112d39d274ecf58d22b3d27d04004e25c80df92f8968a98aba5748d0d074370498804f2c5d03d83f4410fcf996b2c2cf22ace900041c WHIRLPOOL 2c1bfd14d8ce8b057f4a592ac99a9a49258404f119047de7758d4110b23bd4b45afc5f3ce9a1778753d912b5443f7940c50393304997954810d53270bef5e1e4
DIST minitest-5.1.0.gem 66048 SHA256 95c90b17f5882e738489d082cf5f1032bf5a332a7ad25e427518e94ec1ffb787 SHA512 2086937f8cdc9f0703351b696840d3d8110c7cd5c61af69bc405c004f715c0fbc837119182063b92d8327f1a0296828658beddd7ade1d697f676fd8b5f2d49a4 WHIRLPOOL f4bb8319e6ac275cdb5b94662a991f6f3a00678c843a3809f3f960bbb0427b542b8e5197f4bfe31dc075cdc383ad578fe087894ea29bdd6c1b658a7577b922c4
DIST minitest-5.2.2.gem 66560 SHA256 b172e713ff888b1d5938787a4338bbb66870b003596595d46389dba9fec3165c SHA512 3539baddebb24049be0eee7933accc5b501f6330240fcb765ae0492e20031e5098212274f83b1f6e06e6a390e1b8db78e444e6ef7ddb658e59b1dd07b37ec4e6 WHIRLPOOL 931a8379f9188d9bf802296ac1e7c358bebfda58f75f326ab97c82a58aa772aeb2a7ee8e09108de3f9c0edfc785935c770af69b447ef905f3a8f66c11793d499

@ -1,52 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-5.0.6.ebuild,v 1.3 2013/08/18 18:45:05 graaff Exp $
EAPI=5
USE_RUBY="ruby18 ruby19 jruby"
RUBY_FAKEGEM_TASK_DOC="docs"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
inherit ruby-fakegem
DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit."
HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_bdepend "
doc? ( dev-ruby/hoe dev-ruby/rdoc )
test? ( dev-ruby/hoe )"
each_ruby_prepare() {
case ${RUBY} in
*jruby)
# Make sure __jtrap is available in all threads. This should
# be fixed in jruby 1.7.x
sed -i -e '8i trap :INFO do ; end' lib/minitest/parallel_each.rb || die
# Avoid failures. Most of these look like low-level jruby
# differences and it looks like these were not run properly
# in previous versions.
for t in test_return_mock_does_not_raise test_mock_args_does_not_raise test_stub_block test_stub_value ; do
command="/${t}/,/^ end/ s:^:#:"
sed -i -e "${command}" test/minitest/test_minitest_mock.rb || die
done
for t in test_run_failing test_run_skip test_run_error test_run_skip_verbose test_run_error_teardown test_runnable_methods_random test_assert_throws_different test_to_s_error_in_test_and_teardown test_run_filtered_including_suite_name_string test_run_filtered_string_method_only test_run_filtered_including_suite_name ; do
command="/${t}/,/^ end/ s:^:#:"
sed -i -e "${command}" test/minitest/test_minitest_unit.rb || die
done
for t in test_name2 "needs to verify throw" ; do
command="/${t}/,/^ end/ s:^:#:"
sed -i -e "${command}" test/minitest/test_minitest_spec.rb || die
done
sed -i -e '/test_report_error/,/^ end/ s:^:#:' test/minitest/test_minitest_reporter.rb || die
;;
esac
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save