Sync with portage [Mon Nov 10 00:40:47 MSK 2014].

mhiretskiy
root 10 years ago
parent c8e6484de7
commit 6a06e37880

@ -4,3 +4,4 @@ DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb42
DIST puppet-3.6.2.tar.gz 2252186 SHA256 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360 SHA512 a1bed4023f880e271f3f35900e158bb7fffa39ac5fde3f8f3a9c4ae416b85bf6e3cce76fd22a3778afcbe218cb7a3fe3137be16cd04eb3dfb4ea72f614276ac6 WHIRLPOOL 5f92b9a853c59706a57b6d0c4ffcd22f2d2d1b923e47f6f1e8dca8241d9ec329f95005e1eb8685eaf35f925c6c70afe17b19208da398402108f1cad31dbb2ab7
DIST puppet-3.7.1.tar.gz 2586237 SHA256 46951c96560fb39bd717b6f4502199772617021f9574fedef00bdd04afb750a2 SHA512 dbb9994764d0da2eceafda3ca9d08fd3cd0f8c4e22980bc54f92c6232d4ef9f5af28fd792c1dc88f1a26363c16430cab67967c54cc3921892fdfb46022a32887 WHIRLPOOL df2cf03baf5ca656c7a7ac36ab9de0c100e0c2f59a897a014ef9d7057a73835541deeaf7db6e1ba8bce56d4292f82ff82e25ee935fbc174e928ea8bfb419d576
DIST puppet-3.7.2.tar.gz 2592103 SHA256 f762c43da42c4b164afe70046ef65de88a389d718e37c79a1e92f4aa4ff571c5 SHA512 c513b5bccbe1e8bbaab49cc67956c4119dd13708d3a5d425221ab53db8fc22076f3f6dc56e9901ab109b4607f8a4c859e84f307d97fe17c675ea1d6b94d08b80 WHIRLPOOL 29131c40ba4f99fa99342653b1ff92cd1460043d58f3c31db7ab12fe3bca495f0277004478f02140780cb3b333f74169a61e6dedd9f138540170ac9ab8bacfb4
DIST puppet-3.7.3.tar.gz 2594007 SHA256 4a3bd7ddb51072c3dd898a8de158cde204a2d8fd0b84e8ac806b84c074348637 SHA512 74baae5525090ac6213cc8ef27ad74cde5372ac08f8d5c11ed2a4bd2f6ed2b9940fa141ddb705328785611cbd0d32d70a40f1b44dbc9b167e11f0ad1051efc8b WHIRLPOOL 7ff9909c6bfb4d83caf8fbfcac11dff27c3a7583a68336040d404745bf35f4676933b6494d2c65c1f87fc9de5928ac9ae79f81e0b0a356088c0be5d8526ad42a

@ -0,0 +1,189 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.3.ebuild,v 1.1 2014/11/08 22:44:16 prometheanfire Exp $
EAPI="5"
USE_RUBY="ruby19 ruby20"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="http://puppetlabs.com/"
SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~sparc ~x86"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
dev-ruby/json
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite3? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
DEPEND="${DEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )"
RDEPEND="${RDEPEND}
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_prepare() {
# Avoid spec that require unpackaged json-schema.
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# Avoid Rails specs to avoid this dependency and because they
# currently fail against Rails 4.1.
find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
rm -r spec/unit/rails || die
rm spec/unit/parser/collector_spec.rb || die
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
# Avoid failing spec that need further investigation.
rm spec/unit/module_tool/metadata_spec.rb || die
}
all_ruby_compile() {
if use emacs ; then
elisp-compile ext/emacs/puppet-mode.el
fi
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_ruby_install() {
each_fakegem_install
#${RUBY} install.rb --destdir="${D}" install || die
}
all_ruby_install() {
all_fakegem_install
#systemd stuffs
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
insinto /usr/lib/tmpfiles.d
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
newinitd "${FILESDIR}"/puppet.init-r1 puppet
# Initial configuration files
insinto /etc/puppet
# Location of log and data files
keepdir /var/log/puppet
fowners -R puppet:puppet /var/log/puppet
if use minimal ; then
rm "${ED}/etc/puppet/auth.conf"
else
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
insinto /etc/puppet
keepdir /etc/puppet/manifests
keepdir /etc/puppet/modules
keepdir /var/lib/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/lib/puppet
fperms 0750 /var/lib/puppet
fi
fperms 0750 /etc/puppet
fowners :puppet /etc/puppet
if use emacs ; then
elisp-install ${PN} ext/emacs/puppet-mode.el*
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
}
pkg_postinst() {
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
elog "cause puppet to hang while installing packages."
elog
elog "Portage Puppet module with Gentoo-specific resources:"
elog "http://forge.puppetlabs.com/gentoo/portage"
elog
if [ \
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-f "${EPREFIX}/etc/puppet/puppetca.conf" \
] ; then
elog
elog "Please remove deprecated config files."
elog " /etc/puppet/puppetca.conf"
elog " /etc/puppet/puppetd.conf"
elog " /etc/puppet/puppetmasterd.conf"
elog
fi
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
elog
elog "If you're upgrading from 2.x then we strongly suggest you to read:"
elog "http://docs.puppetlabs.com/guides/upgrading.html"
elog
fi
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}

@ -1,3 +1,3 @@
DIST syslog-ng_3.4.7.tar.gz 3203894 SHA256 7b1114ff0bd9d2c52a8ce407f0f59102ea4123ff7efb3f84253961e0de6ac1b0 SHA512 66c1dafaa9441fd909b450e79ec3d1011bd423301602b0eea372e141ff267ddb60aa0280ef49b1f62d24b3f17fc1909a6ce8cc5bea0e3c6708df64815a534279 WHIRLPOOL b3b9aef566cc4577b4ec6ad96f696e29abd84d663205cadca766a50c933d29e3b195b6679cbb8e0edca96cc6995ab10fe409531eb15c90bfeb82a598ad7cf3fe
DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512 23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e WHIRLPOOL 1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434
DIST syslog-ng_3.5.6.tar.gz 3001992 SHA256 6ca2010445e7801f72064a6c620bdcfb4957fc22299c57c1afc6be4b678b21a6 SHA512 073debf13b384f33ca3f336bf30e58ade2ba847ad068164598db377556be3b22ac430e22d76180e16f57a2d0daf60b7e39323e794635568e9a4374b40e4a7e87 WHIRLPOOL 5169acceec9fe526121cee5599b65f6a0ebabf959c248750e257c3ddfbf2ab00b69d9159483976e5b8bc6d1ae9aeb39816f80f9b31fca85c9966f47b99483ae1
DIST syslog-ng_3.6.1.tar.gz 3204906 SHA256 a7823679038117eb63aff7b5cd66fc6a0adcef8e85cfaadc94c3cf2b66d774e8 SHA512 2d321b7b7e330019c9c5111d54ebdce273a054f3c8db2770e141a1119233ec6663e5c10a45a313602c7af6b7d7adaf70fe8f535617492837a4f4807bbc73bb1d WHIRLPOOL 1c7716599f71411ee9666b7d1e40cc73e2b67d6872fdc5df3e785bb7815dfd1ce612db30a9b81dcf8edf15a44b577b9ab330c31ad59bed4aa364ae8cf585434b

@ -0,0 +1,11 @@
--- modules/afsmtp/Makefile.am.orig 2014-11-09 02:47:00.110145300 -0500
+++ modules/afsmtp/Makefile.am 2014-11-09 02:47:13.996684666 -0500
@@ -12,7 +12,7 @@
modules/afsmtp/afsmtp-parser.c \
modules/afsmtp/afsmtp-parser.h
modules_afsmtp_libafsmtp_la_LIBADD = \
- $(LIBESMTP_LIBS) $(MODULE_DEPS_LIBS) $(CRYPTO_LIBS)
+ $(MODULE_DEPS_LIBS) $(LIBESMTP_LIBS) $(CRYPTO_LIBS)
modules_afsmtp_libafsmtp_la_LDFLAGS = \
$(MODULE_LDFLAGS)
modules_afsmtp_libafsmtp_la_DEPENDENCIES= \

@ -0,0 +1,37 @@
@version: 3.6
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
#
# Syslog-ng default configuration file for Gentoo Linux
# https://bugs.gentoo.org/show_bug.cgi?id=426814
@include "scl.conf"
options {
threaded(yes);
chain_hostnames(no);
# The default action of syslog-ng is to log a STATS line
# to the file every 10 minutes. That's pretty ugly after a while.
# Change it to every 12 hours so you get a nice daily update of
# how many messages syslog-ng missed (0).
stats_freq(43200);
# The default action of syslog-ng is to log a MARK line
# to the file every 20 minutes. That's seems high for most
# people so turn it down to once an hour. Set it to zero
# if you don't want the functionality at all.
mark_freq(3600);
};
source src { system(); internal(); };
destination messages { file("/var/log/messages"); };
# By default messages are logged to tty12...
destination console_all { file("/dev/tty12"); };
# ...if you intend to use /dev/console for programs like xconsole
# you can comment out the destination line above that references /dev/tty12
# and uncomment the line below.
#destination console_all { file("/dev/console"); };
log { source(src); destination(messages); };
log { source(src); destination(console_all); };

@ -0,0 +1,25 @@
@version: 3.6
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
#
# Syslog-ng default configuration file for Gentoo FreeBSD
#
# https://bugs.gentoo.org/show_bug.cgi?id=426814
@include "scl.conf"
options {
threaded(yes);
chain_hostnames(no);
# The default action of syslog-ng is to log a STATS line
# to the file every 10 minutes. That's pretty ugly after a while.
# Change it to every 12 hours so you get a nice daily update of
# how many messages syslog-ng missed (0).
stats_freq(43200);
};
source src { system(); internal(); };
destination messages { file("/var/log/messages"); };
log { source(src); destination(messages); };

@ -0,0 +1,115 @@
@version: 3.6
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
# https://bugs.gentoo.org/show_bug.cgi?id=426814
@include "scl.conf"
#
# Syslog-ng configuration file, compatible with default hardened installations.
#
options {
threaded(yes);
chain_hostnames(no);
stats_freq(43200);
};
source src {
unix-dgram("/dev/log");
internal();
};
source kernsrc {
file("/proc/kmsg");
};
#source net { udp(); };
#log { source(net); destination(net_logs); };
#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
destination authlog { file("/var/log/auth.log"); };
destination _syslog { file("/var/log/syslog"); };
destination cron { file("/var/log/cron.log"); };
destination daemon { file("/var/log/daemon.log"); };
destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
destination lpr { file("/var/log/lpr.log"); };
destination user { file("/var/log/user.log"); };
destination uucp { file("/var/log/uucp.log"); };
#destination ppp { file("/var/log/ppp.log"); };
destination mail { file("/var/log/mail.log"); };
destination avc { file("/var/log/avc.log"); };
destination audit { file("/var/log/audit.log"); };
destination pax { file("/var/log/pax.log"); };
destination grsec { file("/var/log/grsec.log"); };
destination mailinfo { file("/var/log/mail.info"); };
destination mailwarn { file("/var/log/mail.warn"); };
destination mailerr { file("/var/log/mail.err"); };
destination newscrit { file("/var/log/news/news.crit"); };
destination newserr { file("/var/log/news/news.err"); };
destination newsnotice { file("/var/log/news/news.notice"); };
destination debug { file("/var/log/debug"); };
destination messages { file("/var/log/messages"); };
destination console { usertty("root"); };
destination console_all { file("/dev/tty12"); };
#destination loghost { udp("loghost" port(999)); };
destination xconsole { pipe("/dev/xconsole"); };
filter f_auth { facility(auth); };
filter f_authpriv { facility(auth, authpriv); };
filter f_syslog { not facility(authpriv, mail); };
filter f_cron { facility(cron); };
filter f_daemon { facility(daemon); };
filter f_kern { facility(kern); };
filter f_lpr { facility(lpr); };
filter f_mail { facility(mail); };
filter f_user { facility(user); };
filter f_uucp { facility(uucp); };
#filter f_ppp { facility(ppp); };
filter f_news { facility(news); };
filter f_debug { not facility(auth, authpriv, news, mail); };
filter f_messages { level(info..warn)
and not facility(auth, authpriv, mail, news); };
filter f_emergency { level(emerg); };
filter f_info { level(info); };
filter f_notice { level(notice); };
filter f_warn { level(warn); };
filter f_crit { level(crit); };
filter f_err { level(err); };
filter f_avc { message(".*avc: .*"); };
filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
log { source(src); filter(f_authpriv); destination(authlog); };
log { source(src); filter(f_syslog); destination(_syslog); };
log { source(src); filter(f_cron); destination(cron); };
log { source(src); filter(f_daemon); destination(daemon); };
log { source(kernsrc); filter(f_kern); destination(kern); };
log { source(src); filter(f_lpr); destination(lpr); };
log { source(src); filter(f_mail); destination(mail); };
log { source(src); filter(f_user); destination(user); };
log { source(src); filter(f_uucp); destination(uucp); };
log { source(kernsrc); filter(f_pax); destination(pax); };
log { source(kernsrc); filter(f_grsec); destination(grsec); };
log { source(kernsrc); filter(f_audit); destination(audit); };
log { source(kernsrc); filter(f_avc); destination(avc); };
log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
log { source(src); filter(f_news); filter(f_err); destination(newserr); };
log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
log { source(src); filter(f_debug); destination(debug); };
log { source(src); filter(f_messages); destination(messages); };
log { source(src); filter(f_emergency); destination(console); };
#log { source(src); filter(f_ppp); destination(ppp); };
log { source(src); destination(console_all); };

@ -0,0 +1,42 @@
# Config file for /etc/init.d/syslog-ng
# If you are not using network logging, this entire section should be
# commented out. Otherwise, choose one of the settings below based on
# how you are configuring your network.
#
# If you are using the net.* scripts to configure your network, you should
# set rc_need to match the interface through which your logging server
# can be reached.
#rc_need="net.eth0"
#
# If you are using an interface manager like wicd, dhcpcd in standalone
# mode, networkmanager, etc to control your interfaces, set rc_need to
# the name of that service.
# rc_need="dhcpcd"
#rc_need="networkmanager"
#
# If you are using newnet and configuring your interface statically with
# the network script, you should use this setting.
#rc_need="network"
#
# You can use this setting, but I do not recommend relying on it.
#rc_need="net"
#
# You may also want to uncomment the following if you are using network
# logging.
#rc_use="stunnel"
# For very customized setups these variables can be adjusted as needed
# but for most situations they should remain commented:
# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
# SYSLOG_NG_PIDFILE_DIR=/var/run
# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
# SYSLOG_NG_GROUP=root
# SYSLOG_NG_USER=root
# Put any additional options for syslog-ng here.
# See syslog-ng(8) for more information.
SYSLOG_NG_OPTS=""

@ -0,0 +1,59 @@
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run}
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
command="/usr/sbin/syslog-ng"
command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
extra_commands="checkconfig"
extra_started_commands="reload"
pidfile="${SYSLOG_NG_PIDFILE}"
start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
description="Syslog-ng is a syslog replacement with advanced filtering features."
description_checkconfig="Check the configuration file that will be used by \"start\""
description_reload="Reload the configuration without exiting"
required_files="${SYSLOG_NG_CONFIGFILE}"
required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
depend() {
use clock
need hostname localmount
after bootmisc
provide logger
}
checkconfig() {
ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
}
start_pre() {
checkconfig || return 1
checkpath \
-d \
--mode 0700 \
--owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \
"${SYSLOG_NG_STATEFILE_DIR}"
}
stop_pre() {
[ "$RC_CMD" = restart ] && sleep 1
return 0
}
reload() {
checkconfig || return 1
ebegin "Reloading configuration and re-opening log files"
start-stop-daemon --signal HUP --pidfile "${pidfile}"
eend $?
}

@ -12,5 +12,6 @@
<flag name='json'>Enable support for JSON template formatting via <pkg>dev-libs/json-glib</pkg></flag>
<flag name='mongodb'>Enable support for mongodb destinations</flag>
<flag name='pacct'>Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
<flag name='redis'>Enable support for Redis destinations</flag>
</use>
</pkgmetadata>

@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.5.6.ebuild,v 1.1 2014/09/06 06:47:22 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.1.ebuild,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
EAPI=5
inherit eutils multilib systemd versionator
inherit autotools eutils multilib systemd versionator
MY_PV=${PV/_/}
MY_PV_MM=$(get_version_component_range 1-2)
@ -14,22 +14,23 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/sourc
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="amqp caps dbi geoip ipv6 json mongodb pacct +pcre smtp spoof-source ssl systemd tcpd"
IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
RESTRICT="test"
RDEPEND="
pcre? ( dev-libs/libpcre )
caps? ( sys-libs/libcap )
dbi? ( >=dev-db/libdbi-0.8.3 )
geoip? ( >=dev-libs/geoip-1.5.0 )
json? ( >=dev-libs/json-c-0.9 )
redis? ( dev-libs/hiredis )
smtp? ( net-libs/libesmtp )
spoof-source? ( net-libs/libnet:1.1 )
ssl? ( dev-libs/openssl:= )
smtp? ( net-libs/libesmtp )
systemd? ( sys-apps/systemd )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
dev-libs/libpcre
>=dev-libs/eventlog-0.2.12
>=dev-libs/glib-2.10.1:2
json? ( >=dev-libs/json-c-0.9 )
caps? ( sys-libs/libcap )
geoip? ( >=dev-libs/geoip-1.5.0 )
dbi? ( >=dev-db/libdbi-0.8.3 )
systemd? ( sys-apps/systemd )"
>=dev-libs/glib-2.10.1:2"
DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/flex"
@ -37,6 +38,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PN}-${MY_PV}
src_prepare() {
epatch "${FILESDIR}/${MY_PV_MM}"/${P}-link-smtp.patch
eautoreconf
cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
cd "${TMPDIR}" || die
@ -54,6 +57,7 @@ src_prepare() {
}
src_configure() {
#adddeny $(echo /usr/$(get_libdir)/libsyslog* | sed 's/ /:/g')
econf \
--disable-docs \
--with-ivykis=internal \
@ -70,7 +74,7 @@ src_configure() {
$(use_enable json) \
$(use_enable mongodb) \
$(use_enable pacct) \
$(use_enable pcre) \
$(use_enable redis) \
$(use_enable smtp) \
$(use_enable amqp) \
$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
@ -84,10 +88,9 @@ src_install() {
# -j1 for bug #484470
emake -j1 DESTDIR="${D}" install
dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
"${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
"${TMPDIR}/syslog-ng.logrotate.hardened" \
"${FILESDIR}/README.hardened"
dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf*
contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
"${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
# Install default configuration
insinto /etc/syslog-ng

@ -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-crypt/gnupg/gnupg-2.1.0.ebuild,v 1.1 2014/11/06 16:44:04 k_f Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.0.ebuild,v 1.4 2014/11/09 01:42:34 k_f Exp $
EAPI="5"
@ -19,7 +19,7 @@ IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
COMMON_DEPEND_LIBS="
dev-libs/npth
>=dev-libs/libassuan-2
>=dev-libs/libgcrypt-1.6.1
>=dev-libs/libgcrypt-1.6.2
>=dev-libs/libgpg-error-1.15
>=dev-libs/libksba-1.0.7
>=net-misc/curl-7.10
@ -124,9 +124,6 @@ src_install() {
dosym gpg2 /usr/bin/gpg
dosym gpgv2 /usr/bin/gpgv
dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
@ -160,4 +157,11 @@ pkg_postinst() {
ewarn "of the agent is currently used. If you are unsure of the gpg"
ewarn "agent you are using please run 'killall gpg-agent',"
ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
if [[ -n ${REPLACING_VERSIONS} ]]; then
elog "If upgrading from a version prior than 2.1 you will have to re-import"
elog "secret keys after restarting the gpg-agent as the new version is using"
elog "a new storage mechanism."
elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
fi
}

@ -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-emulation/lxc/lxc-1.0.6-r1.ebuild,v 1.1 2014/10/30 08:50:24 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.0.6-r1.ebuild,v 1.2 2014/11/09 15:28:25 jlec Exp $
EAPI="5"
@ -128,7 +128,7 @@ src_compile() {
src_install() {
default
mv "${ED}"/$(get_bashcompdir)/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
bashcomp_alias ${PN}-start \
${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
@ -153,7 +153,7 @@ src_install() {
doexe config/init/systemd/${PN}-devsetup
# Use that script with the systemd service (Similar to upstream
# Makefile.am
cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service
cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
sed -i \
"/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
${PN}_at.service \

@ -1 +1,2 @@
DIST openstack-guest-agents-unix-1.39.0.tar.gz 75013 SHA256 eaa22564c8da46c2c1c08e6c0ccd2507e181ffac66fa89f1d9ac2323a2a77d97 SHA512 4f7c4c1f2bc2c8ebda25dc8c0fa79c39e8e5a83040ff103f8c583d9142e71c6527d23e430da983e3a8c9add508298c31ec13a7e56d1db3b5338736dd470fec80 WHIRLPOOL 8e91593dcf6e1f0a8281a9a19946aa67c6e57acfcd5dd5739cddc9b0db0ea0952552f592f598a156140f5c8834fd47f9e20fddddec0f7648bcc40ebce0127d63
DIST openstack-guest-agents-unix-1.39.1.tar.gz 75458 SHA256 dab0bafb2a632040b0e76ac277fee5714dc8eb9cb9781e80f64a94aaa6bd06a2 SHA512 b1e88bb3492018375e7b2275829e2698d82d75c975a396ab7409c9b88f7787145b0da87c81a089aa8914fae30e996654b589bc1675bba769b661d7d1deb9590d WHIRLPOOL 5ba6cf326b78ea5141611b59d9d2b21b9c6a54f4ed9b358a6751ac135a77eac0c20a0b8ce7e078557158bc6a0192e13fed44c75bb9e7794eded1f4777b24b072

@ -0,0 +1,60 @@
From 84e1a32ee2b8d0607f2868365aa46aaea58f014c Mon Sep 17 00:00:00 2001
From: Nate House <nathan.house@rackspace.com>
Date: Mon, 20 Oct 2014 18:50:52 -0500
Subject: [PATCH] Updated regexp to work with config headers added sometime ago
---
tests/test_resetnetwork_interfaces.py | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/tests/test_resetnetwork_interfaces.py b/tests/test_resetnetwork_interfaces.py
index dc8e7e7..b12b84c 100644
--- a/tests/test_resetnetwork_interfaces.py
+++ b/tests/test_resetnetwork_interfaces.py
@@ -344,17 +344,13 @@ def test_gentoo_legacy_ipv4(self):
generated = outfiles['net'].rstrip()
# (todo: naterh) Update tests to mock for both ifconfig/iproute2
- pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
+ # (todo: naterh) Remove excessive unused kwargs
+ pattern = ('.*?modules="(ifconfig|iproute2)"\n*' +
'# Label public\n*' +
'config_eth0=\(\s*"192.0.2.42 netmask 255.255.255.0"\s*\)\n*' +
'routes_eth0=\(\s*"default via 192.0.2.1"\s*\)\n*' +
- 'dns_servers_eth0=\(\s*"192.0.2.2"\s*\)').format(
- ip=interface['ipv4'][0][0],
- netmask=interface['ipv4'][0][1],
- gateway=interface['gateway4'],
- dns=interface['dns'][0]
- )
- expected_regex = re.compile(pattern, re.MULTILINE)
+ 'dns_servers_eth0=\(\s*"192.0.2.2"\s*\)')
+ expected_regex = re.compile(pattern, re.DOTALL)
self.assertRegexpMatches(generated, expected_regex)
@@ -373,17 +369,17 @@ def test_gentoo_legacy_ipv6(self):
# (todo: naterh) Update tests to mock for both ifconfig/iproute2
generated = outfiles['net'].rstrip()
- pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
+ pattern = ('.*?modules="(ifconfig|iproute2)"\n*' +
'# Label public\n*' +
'config_eth0=\(\s*"{ip}/{netmask_len}"\s*\)\n*' +
'routes_eth0=\(\s*"default via {gateway}"\s*\)\n*' +
'dns_servers_eth0=\(\s*"{dns}"\s*\)').format(
- ip=interface['ipv6'][0][0],
- netmask_len=interface['ipv6'][0][1],
- gateway=interface['gateway6'],
- dns=interface['dns'][0]
- )
- expected_regex = re.compile(pattern, re.MULTILINE)
+ ip=interface['ipv6'][0][0],
+ netmask_len=interface['ipv6'][0][1],
+ gateway=interface['gateway6'],
+ dns=interface['dns'][0]
+ )
+ expected_regex = re.compile(pattern, re.DOTALL)
self.assertRegexpMatches(generated, expected_regex)

@ -0,0 +1,57 @@
From 4453b4773688eef6c60736d9cf07100716308a5e Mon Sep 17 00:00:00 2001
From: Nate House <nathan.house@rackspace.com>
Date: Sun, 19 Oct 2014 15:49:35 -0500
Subject: [PATCH] Updated tests to check for either ifconfig/iproute2
---
tests/test_resetnetwork_interfaces.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/test_resetnetwork_interfaces.py b/tests/test_resetnetwork_interfaces.py
index f2b73bf..dc8e7e7 100644
--- a/tests/test_resetnetwork_interfaces.py
+++ b/tests/test_resetnetwork_interfaces.py
@@ -343,8 +343,8 @@ def test_gentoo_legacy_ipv4(self):
self.assertTrue('net' in outfiles)
generated = outfiles['net'].rstrip()
-
- pattern = ('modules=\( "ifconfig" \)\n*' +
+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
+ pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
'# Label public\n*' +
'config_eth0=\(\s*"192.0.2.42 netmask 255.255.255.0"\s*\)\n*' +
'routes_eth0=\(\s*"default via 192.0.2.1"\s*\)\n*' +
@@ -371,8 +371,9 @@ def test_gentoo_legacy_ipv6(self):
self.assertTrue('net' in outfiles)
+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
generated = outfiles['net'].rstrip()
- pattern = ('modules=\( "ifconfig" \)\n*' +
+ pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
'# Label public\n*' +
'config_eth0=\(\s*"{ip}/{netmask_len}"\s*\)\n*' +
'routes_eth0=\(\s*"default via {gateway}"\s*\)\n*' +
@@ -399,8 +400,9 @@ def test_gentoo_openrc_ipv4(self):
self.assertTrue('net' in outfiles)
+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
generated = outfiles['net'].rstrip()
- pattern = ('modules="ifconfig"\n*' +
+ pattern = ('modules="ifconfig|iproute2"\n*' +
'# Label public\n*' +
'config_eth0="\s*{ip}/{netmask_len}\s*"\n*' +
'routes_eth0="\s*default via {gateway}\s*"\n*' +
@@ -429,8 +431,9 @@ def test_gentoo_openrc_ipv6(self):
self.assertTrue('net' in outfiles)
+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
generated = outfiles['net'].rstrip()
- pattern = ('modules="ifconfig"\n*' +
+ pattern = ('modules="ifconfig|iproute2"\n*' +
'# Label public\n*' +
'config_eth0="\s*{ip}/{netmask_len}\s*"\n*' +
'routes_eth0="\s*default via {gateway}\s*"\n*' +

@ -0,0 +1,65 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild,v 1.1 2014/11/09 03:46:59 alunduil Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit autotools eutils python-single-r1 vcs-snapshot
DESCRIPTION="Openstack Unix Guest Agent"
HOMEPAGE="http://github.com/rackerlabs/openstack-guest-agents-unix"
SRC_URI="https://github.com/rackerlabs/${PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
CDEPEND="
dev-python/pycrypto[${PYTHON_USEDEP}]
dev-python/pyxenstore[${PYTHON_USEDEP}]
dev-util/patchelf
${PYTHON_DEPS}
"
DEPEND="
${CDEPEND}
test? (
dev-python/mox[${PYTHON_USEDEP}]
dev-python/unittest2[${PYTHON_USEDEP}]
)
"
RDEPEND="${CDEPEND}"
pkg_setup() {
python-single-r1_pkg_setup
}
src_prepare() {
epatch \
"${FILESDIR}"/4453b4773688eef6c60736d9cf07100716308a5e.patch \
"${FILESDIR}"/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
# Note: https://github.com/rackerlabs/openstack-guest-agents-unix/issues/52
ebegin 'patching tests/test_injectfile.py'
sed \
-e '97,127 d' \
-i tests/test_injectfile.py
STATUS=$?
eend ${STATUS}
[[ ${STATUS} -gt 0 ]] && die
eautoreconf
}
src_install() {
emake DESTDIR="${D}" install
doinitd scripts/gentoo/nova-agent
}
pkg_postinst() {
elog "If you would like to utilize openstack-guest-agents-unix, add 'nova-agent' to"
elog "your 'default' runlevel:"
elog " rc-update add nova-agent default"
}

@ -1 +1,2 @@
DIST openscap-1.0.8.tar.gz 13576237 SHA256 5dc420eaf4202d09619abd9f6247ab6db4f7d520a69c27984ba53fcaf1e31b9e SHA512 58fcc90198f82572505fd907351edc9d9609bc036c0cd1c0ab433056eea70a0baf362c811ab7990b8766ef6090a2a0a600803a9c3537d1867c56304d91fe20ff WHIRLPOOL b9d55acf06413db7953ed1d6200856bce6c787d9eda31e76375da43bf886d9b025bc59368f5824e3c6431a4697095a61dc7f6f8a87cd888a774344f86b2a9e9d
DIST openscap-1.1.1.tar.gz 13722034 SHA256 510489099242f655bdff9f8f6641692ed0d035bf05f00f4ed8072b2e028aaf99 SHA512 86cd695098a749fb0ef29233a7bafde6d76379fd891cfc0bcc90e222e228a6968d3a2755a71a0115ed208408ee2f8316fbaf9714de9e3bb0c6a6535407a043b9 WHIRLPOOL e28464332f8e78519519766ef9e1cba509d54cc78cf2e23b1de043d9d68ff641426496b25a02a0da5c363ebd5470af705772b7ad81abad7308eaef8d89e9f568

@ -0,0 +1,139 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-1.1.1.ebuild,v 1.1 2014/11/09 14:43:22 hwoarang Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
inherit bash-completion-r1 eutils multilib python-single-r1
DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
HOMEPAGE="http://www.open-scap.org/"
SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr"
#RESTRICT="test"
RDEPEND="!nss? ( dev-libs/libgcrypt:0 )
nss? ( dev-libs/nss )
acl? ( virtual/acl )
caps? ( sys-libs/libcap )
gconf? ( gnome-base/gconf )
ldap? ( net-nds/openldap )
pcre? ( dev-libs/libpcre )
rpm? ( >=app-arch/rpm-4.9 )
sql? ( dev-db/opendbx )
xattr? ( sys-apps/attr )
dev-libs/libpcre
dev-libs/libxml2
dev-libs/libxslt
net-misc/curl
${PYTHON_DEPS}"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
perl? ( dev-lang/swig )
python? ( dev-lang/swig )
test? (
app-arch/unzip
dev-perl/XML-XPath
net-misc/ipcalc
sys-apps/grep )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
src_prepare() {
# uncoment for debugging test
# sed -i 's,set -e,&;set -x,' tests/API/XCCDF/unittests/test_remediate_simple.sh || die
# sed -i 's,^ bash, LC_ALL=C bash,' tests/probes/process/test_probes_process.sh || die
sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
#probe runlevel for non-centos/redhat/fedora is not implemented
sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
#According to comment of theses tests, we must modify it. For the moment disable it
sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
# theses tests are hardcoded for checking hald process...,
# but no good solution for the moment, disabling them with a fake echo
# because encased in a if then
# sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
# sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
#This test fail
sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh || die
if ! use rpm ; then
sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
fi
if ! use selinux ; then
einfo "Disabling SELinux probes"
sed -i 's,.*selinux.*, echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
#process58 need selinux
sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
fi
if ! use ldap; then
einfo "Disabling LDAP probes"
sed -i 's,ldap.h,ldapp.h,g' configure || die
fi
epatch_user
}
src_configure() {
python_setup
local myconf
if use debug ; then
myconf+=" --enable-debug"
fi
if use python ; then
myconf+=" --enable-python"
else
myconf+=" --enable-python=no"
fi
if use perl ; then
myconf+=" --enable-perl"
fi
if use nss ; then
myconf+=" --with-crypto=nss3"
else
myconf+=" --with-crypto=gcrypt"
fi
if use sce ; then
myconf+=" --enable-sce"
else
myconf+=" --enable-sce=no"
fi
econf ${myconf}
}
src_compile() {
emake
if use doc ; then
cd docs && doxygen Doxyfile || die
fi
}
src_install() {
emake install DESTDIR="${D}"
prune_libtool_files --all
if use doc ; then
dohtml -r docs/html/.
dodoc docs/examples/.
fi
dobashcomp "${D}"/etc/bash_completion.d/oscap
rm -rf "${D}"/etc/bash_completion.d || die
}

@ -1,8 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r9.ebuild,v 1.1 2014/08/03 11:23:31 polynomial-c Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r11.ebuild,v 1.1 2014/11/09 11:49:18 zlogene Exp $
EAPI=4
EAPI=5
GENTOO_DEPEND_ON_PERL="no"
PYTHON_DEPEND="python? *"
SUPPORT_PYTHON_ABIS="1"

@ -1,8 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r10.ebuild,v 1.1 2014/08/03 11:23:31 polynomial-c Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r12.ebuild,v 1.1 2014/11/09 11:49:18 zlogene Exp $
EAPI=4
EAPI=5
GENTOO_DEPEND_ON_PERL="no"
PYTHON_DEPEND="python? *"
SUPPORT_PYTHON_ABIS="1"

@ -1,8 +1,8 @@
# 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-misc/g15daemon/g15daemon-9999.ebuild,v 1.2 2013/03/01 23:16:49 polynomial-c Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-9999.ebuild,v 1.3 2014/11/09 11:49:18 zlogene Exp $
EAPI=4
EAPI=5
GENTOO_DEPEND_ON_PERL="no"
PYTHON_DEPEND="python? *"
SUPPORT_PYTHON_ABIS="1"

@ -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-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.2 2014/11/03 11:14:37 titanofold Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.3 2014/11/09 16:48:12 mrueg Exp $
EAPI=5
@ -61,6 +61,14 @@ RDEPEND="${CDEPEND}
RESTRICT="test"
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
[[ $(gcc-major-version) -lt 4 ]] || \
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 7 ]] ) \
&& die "Sorry, but gcc-4.7 and earlier won't work (see bug #520102)."
fi
}
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
# reverse driver check to keep the order

@ -1,24 +1,36 @@
DIST amd64-debug-libreoffice-4.2.6.3-r1.tar.xz 1018168392 SHA256 1046e8e1fe427f22e72c3ab0407874a1e92c6ae182e2c0c09e2a1430051ba4fe SHA512 920ecc4d3a8bd9908705593e27934c77230ff20d749f3fd993705d8804d30641d8966e7e5f14c7f5a09379f4811e81e92f59e9a37381d3490c2f3183b299011f WHIRLPOOL 2997a6ea13212abf1d824eeadc69eaadfcda5278e55330fd3f611a4b8b61f8b1497d0a7a8b852531a82cfc43eb0d8b520e96f0f783985625e8c4c01e37ec2311
DIST amd64-debug-libreoffice-4.2.6.3-r2.tar.xz 1333001912 SHA256 2d69a7f72e1e007c2ca2e7a05a6a5f40326384330b3b489e9ffce5a94efc3604 SHA512 7fffd867c4ae99d69aa6f0ffb35797089d0ea165c84c06dcafc3cf514b6903422944902ace1df1c250734b79c12a7a4f23b6a091424066f290511923651d5d78 WHIRLPOOL e3fb9f600b4b8eb7840f84997fd132ca48cf2a991338e6b7d5933974dcb58e9cb4e00c5a465419d40fd5493d57e4c1621a48cdd9e2bd6ebee3cacdc917e1976d
DIST amd64-debug-libreoffice-4.2.6.3.tar.xz 1018121960 SHA256 40f6496845afb37d4aa2893eb99c2ca02dc6febf5a05140e449e2905c71aaa4e SHA512 e876f31c28d305fcbaa844ac5b1e3fa82cb5e4d4051b698cfa7a1ab7c9dee178c4e062d54a09a78f606485867314f1e26168db66be7f65da09f1b4d8ab011f92 WHIRLPOOL 732e8a41e4680e0ebfc234000e70ef8188dd23ea05a0b0ccdd17b4de2fb4050e4c8245ccb6663b67cf206f3270812995c00af2b886d80cf64ad23687ddd0ccac
DIST amd64-debug-libreoffice-gnome-4.2.6.3-r1.xd3 60552077 SHA256 27ed95942f0c03634bfaa6acbe8d61e23e2abf02276e138a29ae435c28888314 SHA512 daa2d313034b6f681c0134deac3202c610a32b38f3fb11ff9bfab752d8c40eafecf6c2b926aa5bbf719a4c39453dba486639d9141b0e8c2448363e11e99fe860 WHIRLPOOL 0d5ddd0b04e61c14c87797146cc66f1707d048cffb4a81eaacec11c16fea73615c17d3bd00a78c89f96b28a5c6eb5520a1da35e9afd94c43d86cd4ad371dbe31
DIST amd64-debug-libreoffice-gnome-4.2.6.3-r2.xd3 68432842 SHA256 7f391ebdfce2a97642f5f139ba1da532325529e4bdc328d0cb2f491f0703597e SHA512 e89796254dd590e1fda26aa11dc77482ab53d7e77e9d75c0e52085376ae4032b666f7f30c0992e051afafe4917cca1240d70f3fbfe4ba6d644055d740adf5192 WHIRLPOOL 318dc48f48c22cbc011b5464613419fcc03b6338f12bf576d5dba2bffd5ee579ff6c198f78c81d2ba59fcab137c91d070416813852868878475246aac8a778b2
DIST amd64-debug-libreoffice-gnome-4.2.6.3.xd3 61963855 SHA256 f6a6ca01ff8d4ca955d4e3e88e4322eea3e5771f8eb1f32b884c9521e8d9459c SHA512 9e3538d975c7930f2309de5981ebae705f54ac6823e52cddad0029d9c2f331746a3696f2097d6d214d8cab0194fa60a2783af8930c47f4f4050ef01d6363ebb7 WHIRLPOOL 9bedd0447ec0f2c883293542c546e3cf859fb2a7f4c3fbd6df99849c12a6e91c888ee8cf59ff70023e459376d6a7f93d313da1ba96a7dbea6365c1934653aa51
DIST amd64-debug-libreoffice-gnome-java-4.2.6.3-r1.xd3 525666884 SHA256 5837ab98fe85186b73890c0ef8d7461880409d6c332deec925907c5c8ac902f4 SHA512 3ac48c4a853697fab4bffe8c3777dd84a20f5c2d94eacf0c5bd65939b5eecff533a071be2392ab3e7c88b98e3fae8d3bc3d5b839f17efdd65aa54bfc7ae34292 WHIRLPOOL 8b13e3a719844567102d1c3eaf55d29a5cceddfc617911b50acf535a23d7da45d28594e356b659abf0cb4f9b368de1c01c1ffc1fa74f2cf1d376405c4521d98a
DIST amd64-debug-libreoffice-gnome-java-4.2.6.3-r2.xd3 684352229 SHA256 0444b50e3d8692ed3d0f3c564ef7d8315f46d878890c00fe11f70180b19e8909 SHA512 6a4593268dc9c2fe255615e0b33d4d5a5225e16ad34ea013e4a02e6b25ae364be5ff72f961749d84b1c79951a526d4e1f6c27405de321de80fe3a568826bdf4e WHIRLPOOL 55f41af771868be6d1385f9400977991395e045c89b8ed0d5475c8afb975f24c2e975e57399859970c964dd1a8884830d084f5151e40d06a027c6da72b189126
DIST amd64-debug-libreoffice-gnome-java-4.2.6.3.xd3 527225542 SHA256 4da36c24fbbde41e7b9b5e7118736144194f9d5392f6cd5397c5869aa850ca72 SHA512 f21ddefa8496e927a15a158870acd10834ab184bfe8d597d822232a0d5aefd2b3094771ab64043ff4f749354315e9121a608cccc903f9d3d76e496b5d4bb5667 WHIRLPOOL 9076f7ae16685ae0f7bd0d7b94649f4b02fdaca5c47a1d8f9b579b812a2a0f1eb93a98c74b56c5cc6ce1376de99e9a69c0a52ffa8999745bc69866b844539732
DIST amd64-debug-libreoffice-java-4.2.6.3-r1.xd3 523394899 SHA256 f3679fdf820a4fe300f220ff022880c6773c0d058caed7e25fcb583e31ead764 SHA512 7597f110336c8e0d8165afbe681dadffc8cd0dd5b2e2f32deb865a3a35eacea77d0291104f163f48d0f552236ea18afbf464bdddafe46134c7903f0c309949b6 WHIRLPOOL 7a082e0233181dee89ed97aff5a3ffa3b49799b9ffee7c967a5891d59c69159c7bbe1a600a576e47f936eee5db769ce94e40cb60ee897a8517e9ce90c20c02b1
DIST amd64-debug-libreoffice-java-4.2.6.3-r2.xd3 680347984 SHA256 374f16f710e57a8ce75bb82fc75944d5e349b3b5d3d8de1d7ef792d42beb11ea SHA512 5df6d902520e907d08ffed89fd0f17d484ee7d18696906ecc28fcf8f7f215dad1390a0c0dcd2990e2258bfa465726938b854c83bbdf9bd1eb5f001876573b7ac WHIRLPOOL 91c07b6b2423085945d05cbccec608e93ce7253b218e022e01d790d7828fdb50c86b5e5a0e5a37214e9e51b1244ad01e5e103b5b05929665b858505577c380b1
DIST amd64-debug-libreoffice-java-4.2.6.3.xd3 522631490 SHA256 b0477bfebf96226c868cc1eaf11d013b086a0f20047ef2c10249c144d4ef353b SHA512 0be73ece37a2560e1c1472c3ab5635d84dc29d9efd141afccd89024afe5d913451b53399ab9eb6091013f598efffdf82b63f314683ef18a3e4e2074ad7670d6c WHIRLPOOL 1ef8fab6557a7a819c9759940135c233673554591cf45304c8c0db2dc573632d2742fb9e8a6f128de24ef689a7848b6bc695b37503249350074b06242b31fe82
DIST amd64-debug-libreoffice-kde-4.2.6.3-r1.xd3 328343817 SHA256 5d9bfb7769d034175e00eed5bb79b351904f6b4ecef86d781886e5b7f677a575 SHA512 1f9b34472f9a6a499b91e33d4c7dc4e30cf46d74b57ded96dba55e84be104e22d9187d5534253670ba346d345a1818c0ac4cb2d5b68652c9cf108dc1b30c732c WHIRLPOOL 5c56506b742bd274dd314a066520fc742183c230b5bb54f2476603e83b696f114129e555e517eb0d2e13a66e665d65ec97440fe4ffc43b6a4bc5588f10414e66
DIST amd64-debug-libreoffice-kde-4.2.6.3-r2.xd3 415470855 SHA256 fc787c9df020e2c23e551f44f04894239fb12d3c275429a62a337e5b656ee927 SHA512 0f8b925ab4f84108d7d8cc0bcbf0bb1344fbf6991b74748bb5503256748ed2b01646f4a13e485e615c7a19af50698171dd6fccc0618e8004b765d7afda67073c WHIRLPOOL 8229267bd342b93a273442111cbb76f4f2892966f1e76e5f32c78e5158293bcb976515cd9131c817bb10e2b8c4d12b83a209116628df6aafdd4a58a623293388
DIST amd64-debug-libreoffice-kde-4.2.6.3.xd3 329559073 SHA256 8d05b2ca5626f6ed369ca69d1687037275ea82d846a180c90f8898c7299670be SHA512 46e65d51531e669246e1f268894960c002a8993c657b21f258a846124c57a2414d8801fa0c39ea7ba46ea394eec1e09ff0577f848e1f67024aacdb85a1d44c84 WHIRLPOOL 84dd7f334222f22ceb27293b4c0c122b93474a6a2614134bc86eeb38569cbea24065351150155c670f6d0e921dd7611cc6195f8d4d618a9144105dba6d627f0b
DIST amd64-debug-libreoffice-kde-java-4.2.6.3-r1.xd3 524196341 SHA256 a8c33f763434d8d03aa8052a45434deb8769b4e11ea7171ce517fbe6671eaaeb SHA512 c18a7a1a0e7c94f3f85c038d0de9dd437886335abbe6f41b5694768756a7e18d939e576ff653b8bde78a69c625452bd334464281394e01fe6a693165b83fe2b5 WHIRLPOOL b16e8f5c71fcd8560b6c96c42d4b35bfe5172efbc9c1310b71c472d0ebe4e75098856258159666a8a71f7e56e48eebc139709246ab10a6dfbd3b397aa14403a6
DIST amd64-debug-libreoffice-kde-java-4.2.6.3-r2.xd3 683200442 SHA256 e7682af00de4cb3866fde2f3d4d2c662167b392c75c5217f759fd82b02ad7d7b SHA512 4b9d560a56e08b9163db7c3962035f3429328f16c3b7003b6fff6114edc48b96051468070192224bad0b464893b47694d3820e189a3eab093f5ee5f6d644b2db WHIRLPOOL c6d8f66adab18beef53b2cc0cd0e7c61df588865c9babebd0d24a32225c57f7b7d3a6a00217cacaa52073c84609fef8101bcdb24537ce25f452eff224db14e12
DIST amd64-debug-libreoffice-kde-java-4.2.6.3.xd3 526643641 SHA256 cec399b63cca6af8e2a60e59d485762574be128b1ca66d3771cfe157ab2df892 SHA512 bc459827d92f2caa60b0dec474b8198a6e650b44338e2cd4fa78d77de39cd6aaafc985b6db23707e8dff052b103efe17f572cabe61cf3414e1b37de2c837b349 WHIRLPOOL 9dc6a796da842339311c1c85c6a60d09caef33fb87e5eb5fb0ed67413948dfd3dc7a9e8879e218a21feee6ca814cf73be32fdbec1b75fc2100d8ab33a882c8ae
DIST x86-debug-libreoffice-4.2.6.3-r1.tar.xz 951937916 SHA256 b2257eb174b6b405a45f8c4e736d7af017a125358b4c6ec3040c063bcd226a56 SHA512 c64fec1c0aa36c98fd53c5421bd9eed09bf85df2ada9c5fcd96aceb0cc7766e33ba5dbfc71a001b73c82a1d2b316e0083c8ed6a3137201ccb2cb252b26c56e6f WHIRLPOOL 726577165eebf2f7848901a31663b4cd8575e100046ae48e9c037537b8c44b516b18e7ee31e36d94b52e64dab44ab04a11f13262338a74311c1b0b6c2365a3b5
DIST x86-debug-libreoffice-4.2.6.3-r2.tar.xz 1316364808 SHA256 a5cef1520b3b32dbc490e812227c6b5969b1d1a211e242dae037e1684e041a14 SHA512 830e9cea65fe00dfea85a0861b20665f1a3c2dabb751875688f17c8162c0760cf1e83447e1dd9cdce7f0769252344ad4782ccf8d373107b12aa4b9d49e392038 WHIRLPOOL ccdea15ed236f2009f1161e02bb5b7491d5919a66d7c5ad89ac880723c42f62f21e8ca6c50d3e104074452154d3aae39e80268f96cfe5976382528a65b82f336
DIST x86-debug-libreoffice-4.2.6.3.tar.xz 951949108 SHA256 0708f4d3bdefc2e60199364223d87d5de2aeb76bcf6e213e12cb3884cbaf6ff3 SHA512 d5385decec0cda81387ba75d616b47f88e18252a57990884f57b9892ef86a887bb33a0d338837abb5e2777ba196cc932ff520dd34bea5b0ea4659dbc11fcf4ca WHIRLPOOL 080f5e06dbcbe80ca5e00ff05588fddb354fa0940bdb3dbb74fa523caa90f36f158fb8a0ff99f678d14bfd90b783e4c2bfdb6c63e3533072b2e98df3e50bc878
DIST x86-debug-libreoffice-gnome-4.2.6.3-r1.xd3 4967291 SHA256 8147432b5dfebc5e2ce86e0a864629227b49152903f4529359f6c3dfdd73d9eb SHA512 6fb6be5ef253ddbeceafd7291de3bd043bad51ea9dcfef01994de031e8e4fdc558bcd18c62723508b20d39dffdd3d80a3299523da932403a9aa0b8a14a9ff5cb WHIRLPOOL 4eb9985ded4ed59d02fe74532cc1009b1d5c7616e536fdb4fd819a0793ef148de6ae8c705aceff22b8a33fb2e9826975c7d41b55e196f0ccdf03f9ea3ce2b3b0
DIST x86-debug-libreoffice-gnome-4.2.6.3-r2.xd3 95314718 SHA256 a259d0cba8f35ac9a53e3c92e382f6063f512fb1392068b6a0f37fbbb60bcf1d SHA512 fb876d07214fb1663927c56ecb10c89b56e7c2800a4f5ae73a94423a33039997f96c79a7558540c59518df585cea22fc8e37985e74e3a04973cf049bff389bea WHIRLPOOL 1b7a5d33764a41095f6a941ae699a2aa18ffb1c9dc8577c151c95c876c9810ab1b1f7720ccceb65045b1b53634e2ad32e6e6464f466bcc33498503df3c365d38
DIST x86-debug-libreoffice-gnome-4.2.6.3.xd3 4967158 SHA256 6825a1d15783c828b022a8e07c7f40564510d8c2180f59e19a754a4a1ad690ac SHA512 443dedbb7cea1372d3315c9d06a43ffc2c9aa2dc79a2f3a5388e32e893f6d842fbbd02edaf2385c3a19b3e0ab46ab41ffc87e18f912a44699c18dac3d45dd260 WHIRLPOOL e361d75fef44d5863bb6953dc5ffa6b2278432f0cce69e7d1744e16fdde63fdb683334cadc22935517087421efc9dcc692ec819aab9cfb8019f0d3a9078beed9
DIST x86-debug-libreoffice-gnome-java-4.2.6.3-r1.xd3 422917972 SHA256 600c446d4749f9258fa01fe382ba527d61bd6382f482bdcd93e916dfd9cec4c0 SHA512 6210b88258e8e380e05de158cb4fd5340dcdd9913decccbe9326b4038fc5ea403df23ae27845da3c7c8396a7cccfbac069842ce45a2cf74de03690703d232ed1 WHIRLPOOL bdfaaa800435561f337f39da3b71fe7a9d10b91ba8b0592f798f4230e974baf260d846917d686aa2922dc513959d356e9d5c0391c3ddc7a804f5bb1d341faa68
DIST x86-debug-libreoffice-gnome-java-4.2.6.3-r2.xd3 662134669 SHA256 86ab6ee8d33ac08b69745d3ce62931bb557e28629992292a833552fc4641192c SHA512 47892622b2562baeb1b955d5a3cbde62be9d1083efd938e0115c52ce5d773444a14dbdf68999b5c1131579fe8f708d2c2c833d9594d873ffd8a7a5801de644ad WHIRLPOOL 1d0868708d95de561a1ddb703d8f3697233d6bf27d2b2b6f41ce8b8c803b98e8c3ba6ea2a14e3dc13facaa06dfb12d1840d13517e13280c9509cdf32d0236c19
DIST x86-debug-libreoffice-gnome-java-4.2.6.3.xd3 422903554 SHA256 07db281272f43c1b7be5af552bda45dd4efff666d9b7d50434dc09b5f37fe051 SHA512 3cbaa4241c4e4297a8ac2ea7546d634b40011768767097b026660882dc543f1fd9b0bc356874b71686c275c0a8ebffd436100478b0db9e985278ddbffe0ac406 WHIRLPOOL ca67fabd55bc9ba28073db109f4c377a056b087d37fe03677af44d0b168b4192b1a7f5472d70c51843d2e825cb3e9a76108d8a0ba031916e241a97b4ce4a52c8
DIST x86-debug-libreoffice-java-4.2.6.3-r1.xd3 420281368 SHA256 be4f0109559457d48433d0421681d2fab83639b9d61857957c21e5eb226cb64e SHA512 32420f7e2cbe64c32a4a89fb38bcd236593301e00b87e9ee6bfe1f31ea22563216e1024d9dfe1f7cc334e892559119346767856851f6d60f3ac2ed198d2e9fd5 WHIRLPOOL ec570efba6519b0367522c310628f257c74e4c0e27ba432aee45d83ea3e2edf0463887680130276168268a0a7a1db866bdf5e40d75d7251fd36cbd7d626400f6
DIST x86-debug-libreoffice-java-4.2.6.3-r2.xd3 685151148 SHA256 d4b6443a581cb502379a7c11154b96b629d69eadf46fa3cfa2ff00161667330b SHA512 841afc6404f4828c840bffa99a54a37c4b8e1a3f7077c29b06dd33088e4cc1cedfbcb085cb6009a3ed9aeb1a0abd8df46a78a0246d292eb9f26efa4a4edabb98 WHIRLPOOL 6ec1a4c269a6cbde86eb3b641c5f2d1b939759b681e0efaba7adc0b3311ccb1b36f2b85a64a78e1c2d1572f3f099b6300eb2a36b62305d6353207c7b82516f75
DIST x86-debug-libreoffice-java-4.2.6.3.xd3 420268565 SHA256 e2d719ed5ff0fe6567a314a51dc2b37dd4ebb74f91752ccc69904b50a603fcb6 SHA512 44ffd1bf879daa3b9af0653d89fcfdf7326ea5983a388f1ca8dc4e506cc7bcebe86ef37a38acd77a5ba3c778bc8d91d0e3f9308cc8b5a01d2ad0f87cc090cfe6 WHIRLPOOL 88bd20e101d1314a956129e887cfd2695701438015236fd05fcddf9940b36db1ee0f09b02454e77b8f1972fedad06d309e6cb86ee901f80d8db881939a7611df
DIST x86-debug-libreoffice-kde-4.2.6.3-r1.xd3 250325975 SHA256 b4fcef5ca95f777ae83ca95631046b030964ac49f802e3c0cb63a461694e1295 SHA512 1d0c15013c139401fe0ac40ef484c42b982176f3630b1a69c72a719f14d8cc16197b9bfb1b328440af00d711a214721291232e7c927457d3b677729435240887 WHIRLPOOL 498abb70b2d4a3a16afacba990b6f2945d68d2755002c2344cd841eb9a3319710c94e781f02c14a0fc938afde73b966d5ca6d1c1d4600a701c8b89b2cba1d54b
DIST x86-debug-libreoffice-kde-4.2.6.3-r2.xd3 434107344 SHA256 e544869f353ea1063a338de2e122262ea1e6769d524c4090b771249cec723480 SHA512 c619a2f68ef369d4198af6fa34561ac28aff4493ae9e762e594288a1dc8a67d2e6984433d63045c501b601ee1abd882520a151ab6bcab83cbdb3c85264e4166e WHIRLPOOL cb8cbde47e8c6818c4c2730f743daf97b89086d850c3c119b7431118e6f8bb1eb77ab569c46a4d937d2fba501cfec2c838d3904f2991d5f91ad9b5c64512ea7f
DIST x86-debug-libreoffice-kde-4.2.6.3.xd3 249815238 SHA256 daf788ffb66c44f494f3a6f453f9866328cc08372662253246b618024c86b70f SHA512 12e922117959ff3cdf86498f85ce216c436a0d29fe06a2887b319c9afa0ec104fc3290969b39d3ce1073a0eccfeb06e6e07c070be656a485319cdd8fbe9ff826 WHIRLPOOL 1613c9fae8fb524c97bdeb04a480c3e5bfef3bc3400fc7c4ff726390c9cd8d6fd1090d6c4d4e3b09efecb4e776d321942b7634b001cd167cd9573e6d3d490411
DIST x86-debug-libreoffice-kde-java-4.2.6.3-r1.xd3 421937666 SHA256 32b7222bdd8e6803a0daeb714cdeca8acde545b0088702e73436ef37aaed6454 SHA512 d7b29171e966f6558deb357976441b540e0e4e7dbf139c74956b4bcfbf9f7854cab3ca3e3064c380e171fc27b67064f715c5184e8bef2c06045423b8dc9413f1 WHIRLPOOL 423795562d276b244d9f6396218e8217d2d75f0708e0176efe928b7eb60ca53791249aabacc8af2bbe4825701013ebe5d21c313c169d6bc52ee950cd871622b8
DIST x86-debug-libreoffice-kde-java-4.2.6.3-r2.xd3 660309564 SHA256 a30d3554c06ede8756ce53ed823bfed87082b2ad2fc6704b31a1d17a7587c2aa SHA512 352d6f6b95f503a883d8865d3ec7592ef5eef961ef735e744968f2d4b4808ce461d0436dbc5b41eaa5abcf7345746b5f69add0a2b48ff1692a63492ce327d205 WHIRLPOOL eb9e89160bd4ab9b664d0cd1607b2d4253b7f5b9de443c5e9984731129a67d591ff2cbf3f15dee4d422f398f9c506720a5c8935af0853edb3ccf1aff785dc790
DIST x86-debug-libreoffice-kde-java-4.2.6.3.xd3 421934649 SHA256 8e4bc16bc6b21a86611e9e6edee7f68f74ab17122a182e75c9c210396d145169 SHA512 a278248fa1e21526c34c315891e3dd527b59eb2c48ce8927d090b9262dea186e7f3472ef853a214f941129a12d82a41390011655017d365194337f276275e1a9 WHIRLPOOL 8c926794b4e9bf22c1d2c1294dfe929ded397437dedb86aae12a89b17f1bd8394afa77958d4181fc3a4cea166f4482871b585b8355efe29105349b3297f619da

@ -0,0 +1,86 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.2.6.3-r2.ebuild,v 1.1 2014/11/08 22:56:24 dilfridge Exp $
EAPI=5
BASE_PACKAGENAME="debug"
BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI_AMD64="
${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
kde? (
!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
)
gnome? (
!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
)
!kde? ( !gnome? (
java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
) )
"
SRC_URI_X86="
${BASE_X86_URI}libreoffice-${PVR}.tar.xz
kde? (
!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
)
gnome? (
!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
)
!kde? ( !gnome? (
java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
) )
"
SRC_URI="
amd64? ( ${SRC_URI_AMD64} )
x86? ( ${SRC_URI_X86} )
"
IUSE="gnome java kde"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
DEPEND="dev-util/xdelta:3"
RESTRICT="test strip"
S="${WORKDIR}"
src_unpack() {
einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
local patchname
use kde && patchname="-kde"
use gnome && patchname="-gnome"
use java && patchname="${patchname}-java"
if [ -n "${patchname}" ]; then
einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
fi
einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
}
src_configure() { :; }
src_compile() { :; }
src_install() {
dodir /usr
cp -aR "${S}"/usr/* "${ED}"/usr/ || die
}

@ -1,24 +1,36 @@
DIST amd64-bin-libreoffice-4.2.6.3-r1.tar.xz 72117152 SHA256 61bde5c4913c9d3bfe5b6da226adf535e6e4db749fbe3f497262521fa9b4f41c SHA512 f62fad37c953c3bfc00ac4b3b65c62d967253199ab50befb45bf099a5c0767507696bc81f23f6cf2d66576d85d5c7c1bbf3fb980822713d93b167b68e6318f66 WHIRLPOOL 4d9fd33d02261e9e0b01759609863515bc056b5ee127681b5e5879f9173e0b01798144f2cf9478bffaab7b919c3da7a781a83ca327ac6b0753eeb96e46ff5211
DIST amd64-bin-libreoffice-4.2.6.3-r2.tar.xz 72093316 SHA256 f27113e60abfc57c4d41f2abced4cc4c4b6b3f78c0368092b3fab4c835d4a37f SHA512 32d3ac7da4b9abe54f5e62a37f71354aa5b042ab343531f27fb1251266f5f22eecce9f73a3f27a43c4bb1b2d4e28eb7827110b06723e0719303e4ddb25e26ae5 WHIRLPOOL aaa986c56c6ab687ba8bda40f1164a8d0a28cae2a97b037cfac8df8e03137e48fe585455424a3cadbd443659125917bcfe4d914902618e3e10cb7a96cb56617f
DIST amd64-bin-libreoffice-4.2.6.3.tar.xz 72188452 SHA256 c8ff1ec0c45a8d3782addb6ef53773666ccc24ece6bba2692740859efb2a06d5 SHA512 fdb52f640da0b6447e27b0e978a4370871c6534aa1c71048ca5a66a559c6e76e0ee4505ddce0efb319e0e2b6155f6ded7bde376091cc4e744d952f89d7818987 WHIRLPOOL 3fa280b470d97f733a461582ff9b431be6c392178260d3ba543c55d84f8931e0522d6a136169e26ddf83ea0dca6ba3e8515dd3b56e5bc237021b9a36613283ba
DIST amd64-bin-libreoffice-gnome-4.2.6.3-r1.xd3 1417488 SHA256 c2a795f062a0343e943b6593a7be45fd246c0d79c6ecac203490cf95252836f7 SHA512 2e928712bd7279fb4df4408bf8ac6b9d50a68a4065fe4b4b40474dd4f015f32d4cbac8a9ba9b95b17fcace1a715d6d43cc0e272a8ab220e0c03b321e08c98930 WHIRLPOOL ce758aa0111855c554f826d78b73215249b0550f4e5868753536ad4e09cd4d81488bc70d518d3dae19056f48f2df5e2977a43cbbc97d2b45c8aa302e4dff209e
DIST amd64-bin-libreoffice-gnome-4.2.6.3-r2.xd3 1529119 SHA256 eaca0957641f81f7ba1fd9c89442ad6cc9cf618c67c6a474e0e3aee19f506085 SHA512 b0d3804b2933ebfa60d16de9c6e179ceca01b97e391522e0e9559b043fa66d2bc26e4f0758e7a1cabb8580a932dd19d86561251465bf19eee80547dc9cb8a104 WHIRLPOOL b4f5024f9999a4342f7e4b8abdc6b33f160687b3903317c557d15f06f2b29d81e3841f7d428a5994f40a1b8bf3ee16d5518761dd136e7cad090d370b73f44e2b
DIST amd64-bin-libreoffice-gnome-4.2.6.3.xd3 1434657 SHA256 e87b223bf8680e9d01d7c96a89a6fca1ce19f50ee7984c0e8ecf1309744d6a32 SHA512 1eee91c46195d207d589b0606c70b1393a54d97882f2194292d0ab10d2e49f9611d7398ee39b790d98d7c3cfab82079bfa171906ab74b1ed4062790fceb2ebe2 WHIRLPOOL e95349b4f189b7ae35e56d85f0ad7e06fe7a7763604c1fde961afa3f2fa4ae07258156aabf925d4d2a9c155b01e480cac56e48ae06849f15413abdaf54087b98
DIST amd64-bin-libreoffice-gnome-java-4.2.6.3-r1.xd3 23013985 SHA256 00dfa1bdba2780fb136e7844b214d4ec5b7b198c71e2c75dcaf1d4b4dcde7fbf SHA512 53c8841be0bad3b605fe64c3a648bec6ec20826484df2a658e9041c355014a3450d5e01928dd5c7ccf968fe0dbb6f293c573de7fa2a8543846e98bf79ed75bfa WHIRLPOOL 51012b58ea36efe17d58bd958f3c9695968fc06c896da670506d5c362b930e67417595b1dad9379086ad36df58687ccb0c1a349823339bb236d631631e2f284b
DIST amd64-bin-libreoffice-gnome-java-4.2.6.3-r2.xd3 23600342 SHA256 1bb8c7f2ec8c405115af4c95a678fb1d2fbe447ffd71e83024d651306acef413 SHA512 3c0f27a37ab5d6d1456481f863f2b19619081185507900b6ddd3f4328f2415f7c70d80a4d229884041f3007ad0be9d612172683d848bcd1b849850595bd57f47 WHIRLPOOL b4f404afc4c2f083ada4ea1eee94b538f75b2057f2d89989a648577d9a64e7f9d5332901d679a59f047edbb828c55aed61dda82122a6b451c7ffdf118ae41a5a
DIST amd64-bin-libreoffice-gnome-java-4.2.6.3.xd3 23909386 SHA256 f354f79798dead4d46a6e7c727f05f879db4c81238a28b822a078f6531d49116 SHA512 a9f853bd2be62c7d593201030cfe96cecdfabef83e46ed367c0e07783f938f73ff1d1c25da95226794fa09a5ecc0757fdc5ef4d34169520c22d90ad68f0be70c WHIRLPOOL 551cad0b465c12ab0cf6b6f2493068cb97331c7fc953c1c8a62a831e2ae00299de9454c2014f7f760da2cafdfd7ba94cd580482908c0f5c6959f617f014507c6
DIST amd64-bin-libreoffice-java-4.2.6.3-r1.xd3 22748866 SHA256 cb922f1231526f7da459efd5c103dd723f1d838d2a79ac9bcfddfbf0f04408bc SHA512 6a0d998fa8ba286becec1f9413556f4c519686e019327bcc9218f6440087705ef6a0fe825eb7104acaee8ce15e9d1f40fb74de548bd1201765492a537bc8cf09 WHIRLPOOL f2016301e485cdd0635cbcf960ce549cf6e8db742a79d52eb15bcf684c6003883ba5ae9a23859fec837944cd00ab9bf6b56501f4ddbbdfc83c3f8aab52d23f61
DIST amd64-bin-libreoffice-java-4.2.6.3-r2.xd3 23263662 SHA256 60b3e9ed16246f2250c5150594e9bb725c984dd934b80239186757448c3ec368 SHA512 4ac4e7ff77dfe13d8ffb4af237352e83d7911b32a43ecfe6119dc2990986b0e7cdeb65c86117b25f0751010901cee8a7f90d11c061b7acc86770850bf106218d WHIRLPOOL f8b223c4fb4e93cd3721e8ab128fcd374d6b6910715f9eba92f9ddad71473fc55fc211dd937cba992b480aa47b8c980ba280806ef5881c568a90168242c5b3e0
DIST amd64-bin-libreoffice-java-4.2.6.3.xd3 23364027 SHA256 eacd3153618b3a14b91b06a9d84fec990c9905d38ad38ea2c616288b069d3b45 SHA512 597c96427ed8bf6a896f33ca36d6e9a7e08a8070357bbde0f14ddc99cbeb979c031edf6f60d0a0ee140837bb4a2d4277c331b5319e3675f92055c320a2a7a26c WHIRLPOOL 4e081c6380d567368e4ce6a2a512d7ff2995e110960c34595db85d8e82d2097d3b518ce9a310146f19f9d475bd8b6565d43e0d2bc05e76b1990da0a37a758546
DIST amd64-bin-libreoffice-kde-4.2.6.3-r1.xd3 7541828 SHA256 9b380be7c651cecd8c5067eb268ff94b068e50dada76d541b582c0bcb4d2c30d SHA512 466a9b97ea3d9d49f91b80752b030718b32117f28b7e5a68613e1f4f72f44641026c3bf20e8fa89695a5e150b752906a0a1a8605d925d13496dbd69a908c5a1e WHIRLPOOL 217c41173a6e88a02b28f379d30546c87bcf3fb1d351d8ac13ee8b2870f391a1a17ec1962ea4a988449cd698b4ae7d4f5ac8f40b046e7a6f584b17af7ffb942e
DIST amd64-bin-libreoffice-kde-4.2.6.3-r2.xd3 7894544 SHA256 9d70b98f5992ee4bfcc13499d277d26e678e250d4bae45db2a3ba112d2be5fa0 SHA512 8c25e00232b6b2afe66f4f843a95fc7f992f1ef9cf5657fc7ede7f3ac629c9e446b99bdf4f427d6813d8aeeedb05f184e7ecce58f3e1c3af9d9285f6beebff16 WHIRLPOOL e8692bed0e809dba42ceb4665b88696876c452ad56e3be8508cbfd8f77e65e56a7e6844c52fc4637a59ed50158590be4ee6dad1f7ca4d9ed8d0e34fb9dc87bbc
DIST amd64-bin-libreoffice-kde-4.2.6.3.xd3 8195421 SHA256 7bf461d883c2d72a6160c7f86edb5ec560b79f648d0efbb129ac2fb239b6be1c SHA512 0434d22f08a34a0143800e4673b281a76273212d7ee3e5a0d8b53712bd447975a397fca0bd656c28ed0b44d0a4d7ea8a0f2cc4246f6ac6ec025dfd5324684136 WHIRLPOOL c83e26fa93507f188d692d0a78c8378960ce1b4316ab53260dd193a92ea6c60f4ab058ccf6bff1a0a3717eb59fbab02ee329e3cde99695d2562043e864f9bc1c
DIST amd64-bin-libreoffice-kde-java-4.2.6.3-r1.xd3 22696460 SHA256 7f1686fc5aab08ef88bf15e5f73a267c188db2e6504ae7a272e8fe3f027aa718 SHA512 9af831f1b6f9955ef727f4bc303d4f8522e3a08c8cdb585b5c55de218e6336734014ee69bd31415945101b8d48e9a8cbd576fbc9ea5472880cc17606d2f59abd WHIRLPOOL e00e4acf89c29306419058cbb2418802ce75a4d38f645378383b28b7f0da77919fb9a5bc5dc7d3b0a312bdada84800ea56082a4fdf95bd3b83ae06b6eca47726
DIST amd64-bin-libreoffice-kde-java-4.2.6.3-r2.xd3 23260794 SHA256 24259e005877f7cc15d4db761e9d971ba12ff5749a68625975e69a5313759e6b SHA512 d7ff8e6e38f5f120cebc5dbf45a3c5233dd775ec87028b30a903b84129e757a603ffea46926b4d6d4d824cf6dbffb6595dc229e6fb8f4570bcd15b646d727d1e WHIRLPOOL 687ea5df82c7d35f124dcab45da86a81cb78cea00f077a8fa722897a3d9a560b6ec41ad497a2c970e6293fe55f73d1744051265daabcd7f63e3e0a1827cf8d16
DIST amd64-bin-libreoffice-kde-java-4.2.6.3.xd3 23640280 SHA256 190e0660fe0498c35e545eb8c2a4338aac36ffba302baa72d12d2e314f1e7b1d SHA512 ef07d201c7db417bbcd81c47c1cfa59e9ebe01a29cdf254a0a319fa5507145423c97d4b7a52528bd3377d63cc21809f1ec9105b5f61b2b4743c3325f4d5301f0 WHIRLPOOL f8963c095a940ffe91637beb0a9f9c9ed4a364e2c9cdc922a3c8af51418a66613b5bcbb1ea684041fdca549b1f316f05a459cc6c93b4ab58e46889bba0ea44c9
DIST x86-bin-libreoffice-4.2.6.3-r1.tar.xz 71522164 SHA256 48cf99a0215ceff68b50030ca747467353f49c43126bf3d21e118d2a776d3cc4 SHA512 611337bbcebadd50ed643ff9ca3fff07b28541d062616461fdaa60932473ffb5fdc9e9eef3b1354be43d47cb40391b9178eec7d2e9852b12914d4f592c47036e WHIRLPOOL d1ea874e156c53b4904a2623ba29f617d34e880966df67757ee41b4c1ed2b3a748193848d6a0b2168b62dc6a71b8ce44581c400384d1714f48549f27f1ea9397
DIST x86-bin-libreoffice-4.2.6.3-r2.tar.xz 70440480 SHA256 af3f521a9f2ee749306363e2412a2d626102e90e5b6bd4b6eeba5cbabdc55088 SHA512 18b1a6125a056217ad54b1d84e25f8491cf0fa551efe8faf2c879064b5678a4f3720f285201d5a2c637eeab11d421574bd80d0cd0fe409fd831cd1815d8ac383 WHIRLPOOL bfda5774c600d02cbdf70519b060072a5c1d63d271188af1f450bb590f5f04a397b5a448df9366541c56526898bc0d226cf76bb89de38feb8198c35a0e920604
DIST x86-bin-libreoffice-4.2.6.3.tar.xz 71563148 SHA256 105c5a8750ea183ec37f5909e92840bb4ab04dc2d02b7c1b2e63b44a1f9aac21 SHA512 d4fafd8d57255e0b61775b5ffe83b6345c9b88c11098285f55acd363dc08dcb6bf44ac16b49bde0d4bf477c3e60f87410d676049ef3453fffd0f600d01f74241 WHIRLPOOL 68eee8fb0003677379260359e5f5e8d9f073576c922696c9d56ed091bca7fdc8a9834a18f330779422aa39762af0d00c557593e9723d639c96c434e71f91fe10
DIST x86-bin-libreoffice-gnome-4.2.6.3-r1.xd3 394269 SHA256 a1e9157e8c393478138996567a90c21847d49d62f00ed0b06c921193d3a269f4 SHA512 308b3fc55f0c7ca2468c49dd003d23b4d0a3ae13a32c32e17bed2c32456743bbee4acf430fc8f143707c2c5b3e4afc6b6271cc23dfc8d88bd8a13939cda2ab1e WHIRLPOOL 5cfb34d2181a36cf2fe4eb7571a589e8b76ed81884fdaec4f4e5d4d894b6d9ad924e6b7a0043fba04757c836809f79bf560c2b4b4db2ac4fd8f7119a286c530b
DIST x86-bin-libreoffice-gnome-4.2.6.3-r2.xd3 1452786 SHA256 c8cb264d097fed66305e1f42890355222b374e421a8019e8353085524cf0f70f SHA512 4f9ac55e2cde23c7972a71ea7d958a74880f663e723683cad7822a6c3ee96b4c7e1f9b6282ced7eca50befec35cfbf9eec522c13404d76c2454e41f40c214c46 WHIRLPOOL c89cb0e3589579dfeb5f87ec6b794129b7c18a6a8d64a7f910d637c87e9da0818f4d7802fe1e2eff8a9e87ebab5cf9f9dc5afc5fbfc7a41f64630c26aa8247a0
DIST x86-bin-libreoffice-gnome-4.2.6.3.xd3 396292 SHA256 598ca8fc9aa3e7d32d409627828162e437ce9bbeedef33e7cf6b2f96414fbe06 SHA512 17192c5b0b1d9ab75690ed8dcbc9a45a5fb6a8a962e87ceecd65ba26708906fa1b4ecc97b858968aa547bb8c50115d320c7855d48602aed9740e90febe7e77b6 WHIRLPOOL 687d102039e4ccf8f1b2315e3ea208aa1d0d68f51782ce90e50dc0f9bf09bb6e3dd1a4b161d41724a2e4c09fc446097ff63ec473d5bc7199b5bc11796999cfd1
DIST x86-bin-libreoffice-gnome-java-4.2.6.3-r1.xd3 20568013 SHA256 984cdfd9d815c3137504c471882d18c6daf6033cb4e3ae3f722069819d75ab7a SHA512 2284a4393e49b26bf84847c7f999738a2c5ee57a0854ed2b5fa34f49d14f20e5246dc9bfb9837dc8b2d904777b71ef7baee6cee81149d74176a431c600055d26 WHIRLPOOL a18b12ffcacbb67c43289fc748f5180030fd2e3b0978f40536d94bbb6571e310aed5470067138922e27051a6795942b784c6932cdcf62c114a737e0c62ad3bbd
DIST x86-bin-libreoffice-gnome-java-4.2.6.3-r2.xd3 21063134 SHA256 6fe70e56e3ea990bdec352cf752b3035134f7378fcf22bfa1599f9b5bd13682c SHA512 962b307b62d7fa893e7ecc7370bf02c9752c0ac2c106fad22fedec0ae3fd82d2f2d46e1228abdd11a3bf2ac785dc022d50760d4fcad942d322bfa64779d5526c WHIRLPOOL 1f9630d36e2ac3d164afed07322db348be6a4e0809d173299207da10f0473a69e6992cbbba612c5be5acd82b19b400a5ca2f187cb1cf7ef938d48c44de1de37a
DIST x86-bin-libreoffice-gnome-java-4.2.6.3.xd3 21473701 SHA256 87cff8db68468001c6324612acb4761cf94cab612ab681c7441767308dbfb80a SHA512 3a72064ec45439ee8744f0ca4e8830bbe691e00cf750bc70d258efc14bf98239ed307f596ba6d24b1068bb7bc9f5176eb48b5650b35aa914875fc9069fbf61c2 WHIRLPOOL e061b030fa765aaad115115b239f79bfb35c608afaec25e5e14df477f63e74e3ca0795f28baf8a459c5c9f0a44b33daa8c5b25900752b10d161a7bdbcea0960c
DIST x86-bin-libreoffice-java-4.2.6.3-r1.xd3 20201416 SHA256 36eb730982d752ad4c8bbf8693eaf7553eac5f85f32d2d12ff0101e5661a597f SHA512 6bad0e82f4686f8930566141278d401e4fce0f9552fb0dc29771f093a61cbba8aaca4e52054498092c17c93e38234bb2b36a45da1866e491060244d221f5cd1c WHIRLPOOL fa649688d849c6ec3faf003ea7987e3ad76819183dd723352d9fefccd607269aa4c0263a6c1a0083bab87c32c749d9c1a389c0d065ac490e41c844ab665a5e1f
DIST x86-bin-libreoffice-java-4.2.6.3-r2.xd3 20987822 SHA256 2a33874dd3efadcc5b0e40f7678b026b8ab840b25d21396bcec1687f9f589b77 SHA512 7a7c3aba45eea3246fcd821a4cc31f531aba02709bac76352c812b17122a75708e558eff1b603b4a3a6d8c42b8f7718baa9fcc6c7ec36ae3d03127734bf2b82e WHIRLPOOL cf1e4e4fc54a9ea5c0b5086835a25e682b2490e9437f8e9f977729392684c06db1ac7bf166c7fb52695dd9dd20aae9127bfce01c18365e163040038ca0c274bd
DIST x86-bin-libreoffice-java-4.2.6.3.xd3 20205750 SHA256 4959c7e1d1fafb034d467fd1fb6638e86e89044b00d09e68c96ffc276cb1e1b7 SHA512 e751ff77ac8e93c5b0df754a5bb1edc5288400afee60e3fdc46d9ba981ecbd2091f7a5d3cea6c1047bf27c2c5761c0b7c6c184a53d42f54de1d6a627dfd87e75 WHIRLPOOL 81d685afb6ad670bf1c3ea337f79ebe1cb4b8ed753ad9d89731bb7378b028ed5451a8bd750f241026782793f739a9978b106a1046e586a734fdadd3b51a4c098
DIST x86-bin-libreoffice-kde-4.2.6.3-r1.xd3 5368343 SHA256 d74078ad35a2f46cf4dba7b7ac3a028ba9566a90475985a2890ca60b38ccdb5f SHA512 470b7df5ec058212b1ba446928cd1ab2f34fe1129567a9c3016cfe8591b743b181c775eb73b14bdd4646cbbc3d95c4083a3df29394c3b36cd7e252fd7429d13f WHIRLPOOL 54646ddbf464cba4ffd87b25f8fbc3368033abef84d62c09f001a76c67e173db0396b42fc2aba552c879e5bbd14cdd70e6bd90acf08e6cba69f4a2d6a5022d49
DIST x86-bin-libreoffice-kde-4.2.6.3-r2.xd3 7117480 SHA256 4aa076bc9c6645e704caa196b86ad706b7c6380def6081996872b16916e1791f SHA512 560f576652c71412ae4d73e9b746185b89dd2740604c556237844429bfffca3067d263487e5c55cde92db1340f705aaf935bd6bbb104845183fa7f4400e1a140 WHIRLPOOL 1bdf7ad6ed1befc2e056c3d779319162327845ebd82707d6f5fb5b4e78151b7cfa212cbb18e884737aada2f60809a5a2f9f53603441ccd504add19b83b989207
DIST x86-bin-libreoffice-kde-4.2.6.3.xd3 5255447 SHA256 12ae94fb64cc9ad8ce38a4004cbb04a8c61ba966a27b27ce725bad5342567608 SHA512 747be29f176a7c452121267cd2f68981ba5101e83018b1a3d739b4ad8d9e94e852d4ffdd77f5ec58fe220f580c9bc2b77aa0e33f7727a95755ab764352704d63 WHIRLPOOL 8b0714e2be8ad30b0ecc813f557c4f1d285db9a4f10f8286d9431e63f0d60263278b0dd1826bb2fe291c8181307c740bfbed508607560f9a1d7d59d2848c57af
DIST x86-bin-libreoffice-kde-java-4.2.6.3-r1.xd3 20285423 SHA256 4a2a4b8e65f4c4153df400aa239371a82a2feb1d2e398cd9f65e26dff95f0089 SHA512 1eac644b0b8e2d8a5d8d462b2ccd44fea5067d3fc5f74935ccbd2ecd2d6189ed38a28760a65f5fcd84eb4748ff853935d7b2306be14a8caa12bcecac4d260cca WHIRLPOOL 0eec2f839a924340e194d87b1ec515f8b44450b65399f857bb7118a742072e01c649564ad0258e55dc9aa1cf463acdff59df1a4900a0ca19d182d4b5ac45b9d5
DIST x86-bin-libreoffice-kde-java-4.2.6.3-r2.xd3 20595641 SHA256 bd28cf0c7e439384e7def046646cff3d3da5ea43a0903c826a447b3dc2b4125d SHA512 632cb2dc8a54873bc723df1e592b4271ef6b3b2fa083d2ee32652a1a656194b05bd1f4277219d05eeceb6c00d45b83d4fa5ae771174cfcd35880d2dcbad6dfcd WHIRLPOOL ab7951d5766deb7f6a4b13dc22576a8e23ced963423551576a2e5ddbdb3b5bece8e3e3d393ae0ff4b2428de488ea313ee436357346ce6159074ed17fadb23059
DIST x86-bin-libreoffice-kde-java-4.2.6.3.xd3 20297950 SHA256 602def99da43ea3f2fe6514bf611ece13df605f3c7a6cb1bbeede0f5981f2e73 SHA512 9d8aef3dc1c71ca28ddee428b09324f1ca49a8d5afb650b834b552c4d56581b917b98bb705dcb67d48edb955892804ea48a70517031aa87e4e661aed5d5374bd WHIRLPOOL 00befca3b01a741a99383aa2181e87e8471fa9a538eb2d66ed124ac36b87661860bacfa5b7daafb293a9194bc7105da1f3c7f63725a407b3257735c426e33af9

@ -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-office/libreoffice-bin/libreoffice-bin-4.2.6.3-r2.ebuild,v 1.1 2014/11/08 22:55:00 dilfridge Exp $
EAPI=5
KDE_REQUIRED="optional"
CMAKE_REQUIRED="never"
BASE_PACKAGENAME="bin"
BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
PYTHON_REQ_USE="threads,xml"
inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI_AMD64="
${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
kde? (
!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
)
gnome? (
!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
)
!kde? ( !gnome? (
java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
) )
"
SRC_URI_X86="
${BASE_X86_URI}libreoffice-${PVR}.tar.xz
kde? (
!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
)
gnome? (
!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
)
!kde? ( !gnome? (
java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
) )
"
SRC_URI="
amd64? ( ${SRC_URI_AMD64} )
x86? ( ${SRC_URI_X86} )
"
IUSE="gnome java kde"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
BIN_COMMON_DEPEND="
=app-text/libexttextcat-3.4*
=app-text/libmwaw-0.2*
app-text/poppler:0/46
dev-libs/boost:0/1.55.0
dev-libs/icu:0/53
=media-gfx/graphite2-1.2*
media-libs/harfbuzz:0/0.9.18[icu]
media-libs/libpng:0/16
>=sys-libs/glibc-2.19-r1
virtual/jpeg:62
kde? ( >=kde-base/kdelibs-4.12.5-r2:4 >=dev-qt/qtcore-4.8.5-r2:4 >=dev-qt/qtgui-4.8.5-r3:4 )
"
# PLEASE place any restrictions that are specific to the binary builds
# into the BIN_COMMON_DEPEND block above.
# All dependencies below this point should remain identical to those in
# the source ebuilds.
COMMON_DEPEND="
${BIN_COMMON_DEPEND}
${PYTHON_DEPS}
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.3.2-r3
app-text/mythes
=app-text/libabw-0.0*
>=app-text/libexttextcat-3.2
=app-text/libebook-0.0*
=app-text/libetonyek-0.0*
app-text/liblangtag
=app-text/libmspub-0.0*
=app-text/libmwaw-0.2*
=app-text/libodfgen-0.0*
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
=app-text/libwps-0.2*
>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
>=dev-cpp/clucene-2.3.3.4-r2
dev-cpp/libcmis:0.4
dev-db/unixODBC
>=dev-libs/boost-1.46:=
dev-libs/expat
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.8.1.1:=
>=dev-libs/libatomic_ops-7.2d
=dev-libs/liborcus-0.5*
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
>=dev-libs/openssl-1.0.0d
>=dev-libs/redland-1.0.16
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
>=media-libs/libpng-1.4
=media-libs/libcdr-0.0*
=media-libs/libfreehand-0.0*
=media-libs/libvisio-0.0*
>=net-misc/curl-7.21.4
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
>=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
net-print/cups
>=dev-libs/dbus-glib-0.92
gnome? ( gnome-extra/evolution-data-server )
gnome? ( gnome-base/gconf:2 )
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
virtual/glu
virtual/opengl
net-libs/neon
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice
!<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
"
PDEPEND="
=app-office/libreoffice-l10n-${PV}*
"
DEPEND="dev-util/xdelta:3"
# only one flavor at a time
REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
RESTRICT="test strip"
S="${WORKDIR}"
PYTHON_UPDATER_IGNORE="1"
pkg_pretend() {
[[ $(gcc-major-version) -lt 4 ]] || \
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
}
pkg_setup() {
kde4-base_pkg_setup
}
src_unpack() {
einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
local patchname
use kde && patchname="-kde"
use gnome && patchname="-gnome"
use java && patchname="${patchname}-java"
if [ -n "${patchname}" ]; then
einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
fi
einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
}
src_prepare() {
cp "${FILESDIR}"/50-${PN} "${T}"
eprefixify "${T}"/50-${PN}
}
src_configure() { :; }
src_compile() { :; }
src_install() {
dodir /usr
cp -aR "${S}"/usr/* "${ED}"/usr/
# prevent revdep-rebuild from attempting to rebuild all the time
insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
}
pkg_preinst() {
# Cache updates - all handled by kde eclass for all environments
kde4-base_pkg_preinst
}
pkg_postinst() {
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
use java || \
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
pkg_postrm() {
kde4-base_pkg_postrm
}

@ -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-portage/g-sorcery/g-sorcery-0.1-r1.ebuild,v 1.6 2014/10/16 00:19:20 mrueg Exp $
# $Header: /var/cvsroot/gentoo-x86/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild,v 1.7 2014/11/09 07:51:32 zlogene Exp $
EAPI=5
@ -14,7 +14,7 @@ SRC_URI="https://github.com/jauhien/g-sorcery/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
PDEPEND=">=app-portage/layman-2.2.0[g-sorcery]"

@ -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-portage/layman/layman-2.2.0-r5.ebuild,v 1.1 2014/10/18 21:34:34 twitch153 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.2.0-r5.ebuild,v 1.2 2014/11/09 07:51:05 zlogene Exp $
EAPI="5"
@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test"
DEPEND="test? ( dev-vcs/subversion )"

@ -6,3 +6,4 @@ DIST calibre-1.43.0.tar.xz 35549180 SHA256 3c4ef17591e033e39ba804d18442f63c3ebc1
DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2 SHA512 c6131422891bed0615644336ad1dfc52803ff28d7d33994bea4a34f70655d12ab6b638432156665132805a900324742c41f8d5b7963f24eee4b68359fc433ece WHIRLPOOL dac2b04e195206d7956d7bdb5f45b37cd1e7a873db542d26bd0802d886fb9111aba1e603a795d03a2bf3b55d8cdb92671e11dfdc9fdcdc0707e280a380548f0b
DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9
DIST calibre-2.7.0.tar.xz 35548068 SHA256 4100ffc390a4c852a267c959b94d0c6d9606fb2a70f03b120826b99e59bb1e49 SHA512 9fbc9bf6a2bb72e17656b8f09690d6078dd8aa455c6c70b68b421ec24631f80e48928ba1820bd69f18caa29ef0b76d0f34b7910bd8e747003ebab930ea8654dd WHIRLPOOL d913898d024d6e36a04ffc7ddeafa1df6e6db793458a675db7f2880e6202891cd6c897fd3f51fd58f5031a0eb276bcc16f27ce13d90819b73e435279e1b5aa9d
DIST calibre-2.9.0.tar.xz 35753312 SHA256 bc517af040066cadf44c62a15b45b4aadacdeeb1ef0dae2a42fa9a71a082db3c SHA512 5d402af6591befa304d35b911cb10fa44eadb744b1fc308043d0689278f31fa6dce150be40aec9f07c12d43ab5cde1b5ec657b8d94ab9f2b9eeb465a33ca0dfa WHIRLPOOL b72179ff97f4e4a9cf3b3aecfb3b9697c6b0076d4628e8957381ecc9e36640db2c51ef788c1f7c90f9d569adbc5adf05505b92ec2ff254fe9a4469ae00ebe1a2

@ -0,0 +1,233 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.9.0.ebuild,v 1.2 2014/11/09 13:18:44 yngwin Exp $
EAPI=5
inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
DESCRIPTION="Ebook management application"
HOMEPAGE="http://calibre-ebook.com/"
[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
LICENSE="
GPL-3+
GPL-3
GPL-2+
GPL-2
GPL-1+
LGPL-3+
LGPL-2.1+
LGPL-2.1
BSD
MIT
Old-MIT
Apache-2.0
public-domain
|| ( Artistic GPL-1+ )
CC-BY-3.0
OFL-1.1
PSF-2
unRAR
"
KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE="+udisks"
# Note, dropped dep on >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] as #1, its qt5 now, and
# 2, because repoman blew up when it was there, and my installed copy doesnt seem to link to it.
COMMON_DEPEND="
>=app-text/podofo-0.8.2:=
>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
>=dev-libs/chmlib-0.40:=
>=dev-libs/icu-4.4:=
dev-libs/glib:2
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
>=media-gfx/imagemagick-6.5.9[jpeg,png]
media-libs/fontconfig
>=media-libs/freetype-2:=
>=media-libs/libmtp-1.1.5:=
sys-libs/zlib
udisks? ( virtual/libudev )
x11-libs/libX11
x11-libs/libXext
x11-libs/libXrender
>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
dev-python/netifaces[python_targets_python2_7(-)]
>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
media-fonts/liberation-fonts
>=media-libs/libwmf-0.2.8
virtual/libusb:1=
virtual/python-imaging[python_targets_python2_7(-)]
>=x11-misc/xdg-utils-1.0.2-r2"
RDEPEND="${COMMON_DEPEND}
udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
DEPEND="${COMMON_DEPEND}
>=dev-python/setuptools-0.6_rc5
>=virtual/podofo-build-0.8.2"
src_prepare() {
# Fix outdated version constant.
#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
# -i src/calibre/constants.py || \
# die "sed failed to patch constants.py"
# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
# calls xdg-* (bug #258938).
sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-e "s|PreserveMIMEDefaults():||" \
-e "s|xdg-icon-resource install|\\0 --mode user|" \
-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-i src/calibre/linux.py || die "sed failed to patch linux.py"
# Disable unnecessary privilege dropping for bug #287067.
sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-i setup/install.py || die "sed failed to patch install.py"
sed -e "/^ self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
'-i', 'Makefile'])" \
-i setup/extensions.py || die "sed failed to patch extensions.py"
# use system beautifulsoup, instead of bundled
rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
|| die "could not remove bundled beautifulsoup"
find "${S}" -type f -name \*.py -exec \
sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
|| die "could not sed bundled beautifulsoup out of the source tree"
# avoid failure of xdg tools to recognize vendor prefix
sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-i "${S}"/src/calibre/linux.py || die 'sed failed'
# no_updates: do not annoy user with "new version is availible all the time
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
epatch \
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
"${FILESDIR}/${PN}-disable_plugins.patch"
}
src_install() {
# Bypass kbuildsycoca and update-mime-database in order to
# avoid sandbox violations if xdg-mime tries to call them.
cat - > "${T}/kbuildsycoca" <<-EOF
#!${BASH}
echo $0 : $@
exit 0
EOF
cp "${T}"/{kbuildsycoca,update-mime-database}
chmod +x "${T}"/{kbuildsycoca,update-mime-database}
export QMAKE="/usr/lib/qt5/bin/qmake"
# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
# violation with kbuildsycoca as in bug #287067, comment #13.
export -n DISPLAY
# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
# File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
# return _parse_localename(localename)
# File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
# raise ValueError, 'unknown locale: %s' % localename
#ValueError: unknown locale: 46
export -n LANGUAGE
# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
# variables to point to our fake temporary $HOME.
export HOME="${T}/fake_homedir"
export XDG_CONFIG_HOME="${HOME}/.config"
export XDG_DATA_HOME="${HOME}/.local/share"
export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
tc-export CC CXX
# Bug #334243 - respect LDFLAGS when building extensions
export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
local libdir=$(get_libdir)
[[ -n $libdir ]] || die "get_libdir returned an empty string"
# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
local x
for x in /dev/dri/card[0-9] ; do
[[ -e ${x} ]] && addpredict ${x}
done
dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
"${EPREFIX}"/usr/bin/python2.7 setup.py install \
--root="${D}" \
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/${libdir}" \
--staging-root="${ED}usr" \
--staging-libdir="${ED}usr/${libdir}" || die
grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
die "failed to fix harcoded \$D in paths"
# The menu entries end up here due to '--mode user' being added to
# xdg-* options in src_prepare.
dodir /usr/share/mime/packages
chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
die "failed to register mime types"
dodir /usr/share/icons
mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
die "failed to install icon files"
domenu "${HOME}"/.local/share/applications/*.desktop ||
die "failed to install .desktop menu files"
find "${ED}"usr/share -type d -empty -delete
cd "${ED}"/usr/share/calibre/fonts/liberation || die
local x
for x in * ; do
[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
done
einfo "Converting python shebangs"
while read -r -d $'\0' ; do
local shebang=$(head -n1 "$REPLY")
if [[ ${shebang} == "#!"*python* ]] ; then
sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
die "sed failed"
fi
done < <(find "${ED}" -type f -print0)
einfo "Compiling python modules"
"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
newinitd "${FILESDIR}"/calibre-server.init calibre-server
newconfd "${FILESDIR}"/calibre-server.conf calibre-server
}
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}

@ -0,0 +1,27 @@
diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py
--- calibre-2.9.0.orig/src/calibre/gui2/main.py 2014-11-09 20:09:54.081231882 +0800
+++ calibre-2.9.0/src/calibre/gui2/main.py 2014-11-09 20:15:48.193033844 +0800
@@ -37,8 +37,9 @@
help=_('Start minimized to system tray.'))
parser.add_option('-v', '--verbose', default=0, action='count',
help=_('Ignored, do not use. Present only for legacy reasons'))
- parser.add_option('--no-update-check', default=False, action='store_true',
- help=_('Do not check for updates'))
+ parser.add_option('--update-check', dest='no_update_check', default=True,
+ action='store_false',
+ help=_('Check for updates'))
parser.add_option('--ignore-plugins', default=False, action='store_true',
help=_('Ignore custom plugins, useful if you installed a plugin'
' that is preventing calibre from starting'))
diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
--- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800
+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800
@@ -154,6 +154,8 @@
self.update_checker.signal.update_found.connect(self.update_found,
type=Qt.QueuedConnection)
self.update_checker.start()
+ else:
+ self.update_checker = None
def recalc_update_label(self, number_of_plugin_updates):
self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)

@ -1,5 +1,4 @@
DIST ghostscript-9.10.tar.bz2 30983380 SHA256 6c8d9d1b23bd8ffd238274e342a40ab21762b0aab6355083ca0db673267dd580 SHA512 59f380e52c84b69819ef7d321f323950c22306119cfa7b38809a23e83f9a3af1e35b5d66d9b9e9adef32131aa283a235deec346acced330d7ad7d1201fe7ca04 WHIRLPOOL e4471563d57882bc111f6a0d48a003ee56692f7ae94c53776be4a5f14fe0d43e2671bc04f8af04d65f3e73bd2e7d68961f9d77cbf644cdd327186ee3ed9ed4c2
DIST ghostscript-9.14.tar.bz2 31080058 SHA256 1c74c5aac4042d841b9d5314200b8932a62d03c92d25d329e993534d1279cc74 SHA512 c2188a2b1fbd96ec184cd4171f0c042a9479f89d6e982aaf079d56060df6061721a42b1b98923767dba8081497d8e85593896fb3c26fc35f99610461bf8f16bb WHIRLPOOL 93630d286dfeaaee49f53f80e88e9b14a95e96853ce35f2104d1666b9f669a4d248f3a52e6502abbdcf7d2ab6c8075534197986835353247127760731b2aa357
DIST ghostscript-9.15.tar.bz2 28826065 SHA256 e65daf25059e2f3dabd3535df3d936a42ca4933d36473a03095e39adcdd5315c SHA512 5c800615bb813f827c218145eb3238773e01f0941efca51abf4233ac6fdb96154b362c65a9567dc6b22794cb2caff69a58eb436c7f9c8e5370a4a64087e50c7e WHIRLPOOL 9e434278560af8fcc92119309eaaf80d615571d971b06d6e26f40317224bd7af49f2115eda4c914ed9c0bd4755439c91929fa3884eca5beb968c73377eab5f28
DIST ghostscript-gpl-9.10-patchset-1.tar.bz2 5099 SHA256 f5b515295db2ad70a196ff2aee382d1a01c471ba64671f5b05f504f1109c97c1 SHA512 ae984dae5c426c488480c7c3f0e2eaf473c521c47b968ee91880264f5dbf1df8d992398bbf4dfdc82763953a9ad681c098da3561b203e596ed1ac0edc35d84da WHIRLPOOL c3b353f6f102dd79e229a92770720e50729228baaea950a2b5364541631958616b2d3d55c584875efd75f6c31a5b787bdba87ce452779ec9040966e6019a463d
DIST ghostscript-gpl-9.12-patchset-1.tar.bz2 4940 SHA256 5c0e99a192a6d0e142c4c5f38a2d80ceeeb4a8e2265264d31360b06f3d94e0b5 SHA512 e3daf758c75ecb6a38dbece91b0f44ae06985920080b376384a9b3ad2ad35295530c144832158af2933d5fc49782c1fc6733efc60106193499c615a502f5e656 WHIRLPOOL e9436e1681e95a4b578a9de577d9b487ad119893c141baf840cd5dae0b89f5eedbde6d2f1225fb97c425a6dc3f3fb7f1ea6a02ab02b799438c3002fb933575c6

@ -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-text/ghostscript-gpl/ghostscript-gpl-9.10-r3.ebuild,v 1.2 2014/06/10 01:04:39 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild,v 1.1 2014/11/09 13:51:18 tamiko Exp $
EAPI=5
@ -81,8 +81,6 @@ src_prepare() {
rm -rf "${S}"/libpng
rm -rf "${S}"/tiff
rm -rf "${S}"/zlib
# remove internal urw-fonts
rm -rf "${S}"/Resource/Font
# remove internal CMaps (CMaps from poppler-data are used instead)
rm -rf "${S}"/Resource/CMap

@ -1,221 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.14.ebuild,v 1.2 2014/06/10 01:04:39 vapier Exp $
EAPI=5
inherit autotools eutils multilib versionator flag-o-matic
DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
HOMEPAGE="http://ghostscript.com/"
MY_P=${P/-gpl}
GSDJVU_PV=1.6
PVM=$(get_version_component_range 1-2)
SRC_URI="
http://downloads.ghostscript.com/public/${MY_P}.tar.bz2
mirror://gentoo/${PN}-9.12-patchset-1.tar.bz2
!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="bindist cups dbus djvu gtk idn linguas_de static-libs X"
COMMON_DEPEND="
app-text/libpaper
media-libs/fontconfig
>=media-libs/freetype-2.4.9:2=
media-libs/jbig2dec
>=media-libs/lcms-2.5:2
>=media-libs/libpng-1.6.2:0=
>=media-libs/tiff-4.0.1:0=
>=sys-libs/zlib-1.2.7:=
virtual/jpeg:0
!bindist? ( djvu? ( app-text/djvu ) )
cups? ( >=net-print/cups-1.3.8 )
dbus? ( sys-apps/dbus )
gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
idn? ( net-dns/libidn )
X? ( x11-libs/libXt x11-libs/libXext )
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
RDEPEND="${COMMON_DEPEND}
>=app-text/poppler-data-0.4.5-r1
>=media-fonts/urw-fonts-2.4.9
linguas_ja? ( media-fonts/kochi-substitute )
linguas_ko? ( media-fonts/baekmuk-fonts )
linguas_zh_CN? ( media-fonts/arphicfonts )
linguas_zh_TW? ( media-fonts/arphicfonts )
!!media-fonts/gnu-gs-fonts-std
!!media-fonts/gnu-gs-fonts-other
!<net-print/cups-filters-1.0.36-r2
"
S="${WORKDIR}/${MY_P}"
LANGS="ja ko zh_CN zh_TW"
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
pkg_setup() {
if use bindist && use djvu; then
ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
fi
}
src_prepare() {
# remove internal copies of various libraries
rm -rf "${S}"/cups/libs
rm -rf "${S}"/expat
rm -rf "${S}"/freetype
rm -rf "${S}"/jbig2dec
rm -rf "${S}"/jpeg{,xr}
rm -rf "${S}"/lcms{,2}
rm -rf "${S}"/libpng
rm -rf "${S}"/tiff
rm -rf "${S}"/zlib
# remove internal urw-fonts
rm -rf "${S}"/Resource/Font
# remove internal CMaps (CMaps from poppler-data are used instead)
rm -rf "${S}"/Resource/CMap
# apply various patches, many borrowed from Fedora
# http://pkgs.fedoraproject.org/cgit/ghostscript.git
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
EPATCH_SOURCE="${WORKDIR}/patches/"
epatch
if ! use bindist && use djvu ; then
unpack gsdjvu-${GSDJVU_PV}.tar.gz
cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
grep -q djvusep "${S}"/contrib/contrib.mak || \
cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
# install ps2utf8.ps, bug #197818
cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
"${S}"/base/unixinst.mak || die "sed failed"
fi
if ! use gtk ; then
sed -i -e "s:\$(GSSOX)::" \
-e "s:.*\$(GSSOX_XENAME)$::" \
"${S}"/base/unix-dll.mak || die "sed failed"
fi
# search path fix
# put LDFLAGS after BINDIR, bug #383447
sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
cd "${S}"
eautoreconf
cd "${S}/ijs"
eautoreconf
}
src_configure() {
local FONTPATH
for path in \
/usr/share/fonts/urw-fonts \
/usr/share/fonts/Type1 \
/usr/share/fonts \
/usr/share/poppler/cMap/Adobe-CNS1 \
/usr/share/poppler/cMap/Adobe-GB1 \
/usr/share/poppler/cMap/Adobe-Japan1 \
/usr/share/poppler/cMap/Adobe-Japan2 \
/usr/share/poppler/cMap/Adobe-Korea1
do
FONTPATH="$FONTPATH${FONTPATH:+:}$path"
done
econf \
--enable-dynamic \
--enable-freetype \
--enable-fontconfig \
--enable-openjpeg \
--disable-compile-inits \
--with-drivers=ALL \
--with-fontpath="$FONTPATH" \
--with-ijs \
--with-jbig2dec \
--with-libpaper \
--with-system-libtiff \
--without-lcms \
--without-luratech \
$(use_enable cups) \
$(use_enable dbus) \
$(use_enable gtk) \
$(use_with cups pdftoraster) \
$(use_with idn libidn) \
$(use_with X x)
if ! use bindist && use djvu ; then
sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
"${S}"/Makefile || die "sed failed"
fi
cd "${S}/ijs"
econf \
--enable-shared \
$(use_enable static-libs static)
}
src_compile() {
# workaround: -j1 -> see bug #234378
emake -j1 so all
cd "${S}/ijs"
emake
}
src_install() {
# workaround: -j1 -> see bug #356303
emake -j1 DESTDIR="${D}" install-so install
if ! use bindist && use djvu ; then
dobin gsdjvu
fi
# move gsc to gs, bug #343447
# gsc collides with gambit, bug #253064
mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
cd "${S}/ijs"
emake DESTDIR="${D}" install
# rename the original cidfmap to cidfmap.GS
mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
# install our own cidfmap to handle CJK fonts
insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
doins "${WORKDIR}/fontmaps/CIDFnmap"
doins "${WORKDIR}/fontmaps/cidfmap"
for X in ${LANGS} ; do
if use linguas_${X} ; then
doins "${WORKDIR}/fontmaps/cidfmap.${X}"
fi
done
# install the CMaps from poppler-data properly, bug #409361
dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
use static-libs || find "${D}" -name '*.la' -delete
use linguas_de || rm -r "${D}"/usr/share/man/de
}

@ -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-text/ghostscript-gpl/ghostscript-gpl-9.15.ebuild,v 1.2 2014/10/23 17:37:26 tamiko Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild,v 1.1 2014/11/09 13:51:18 tamiko Exp $
EAPI=5
@ -81,8 +81,6 @@ src_prepare() {
rm -rf "${S}"/libpng
rm -rf "${S}"/tiff
rm -rf "${S}"/zlib
# remove internal urw-fonts
rm -rf "${S}"/Resource/Font
# remove internal CMaps (CMaps from poppler-data are used instead)
rm -rf "${S}"/Resource/CMap
@ -177,16 +175,15 @@ src_configure() {
}
src_compile() {
# workaround: -j1 -> see bug #234378
emake -j1 so all
emake so all
cd "${S}/ijs"
emake
}
src_install() {
# workaround: -j1 -> see bug #356303
emake -j1 DESTDIR="${D}" install-so install
emake DESTDIR="${D}" install-so install
if ! use bindist && use djvu ; then
dobin gsdjvu

@ -1,4 +1,5 @@
DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c
DIST mysql-workbench-community-6.1.6-src.tar.gz 24430390 SHA256 d9fb8364784f75426c0f9c10421e272fefa1fe1994ae933eca54c637a3e769de SHA512 d2955756997b3e8121f0da095ca057407337d0c0257f94ae9b096b95996d260f569f473ffb35a68908649cdc20ca4b3438b3a4b1fabd1b1cd0bb365b3b076c3f WHIRLPOOL 55eac43876e545d0bf8ac4d05f3ad46673695f49590920620e6bb4cf5662628fcce1980f875bcb30315e0823e421a49735b032cd416db5c099f6825c5a39763c
DIST mysql-workbench-community-6.1.7-src.tar.gz 24750696 SHA256 06ac657f7f86f012f75fcf8fa59fc1d422134135485b887a4abd6c9ac2408898 SHA512 d5a4d1f6c6ade06ba775d25f40a7933ba75d87a78f19227e1f9be1c9de85d8ffbbe381161db44c05fa875b6d9f933885e542a3fb829bcedef1305190c6b60984 WHIRLPOOL 15147a2df7b64779b5955b77fe53a4c4fcef74e8d6cb3d925841892144a6256df0a8f41b2fef6c43bc4a3196beb211e393e43c057749d983883b9b857f2ac079
DIST mysql-workbench-community-6.2.3-src.tar.gz 14576661 SHA256 4caba8cf1f8dc0fc57e98a6170ad4718ba44c8f6622ef2359c7a550d080b3846 SHA512 c7d4130e6aeea842347ebf137502159fa17e2baf28bf36e1cb2d39dacf07671b53cfcb54d4f6559ee01d3945d453bedf81b3e58d5f805df15e63bbf113acee27 WHIRLPOOL 15e7624e29cc1a2cf1a786a50c02c2124cbeeb7577be617dcdb3751613d7bdf1cd26a44a430cc08861d3f0416a46ef7bf82abd7d6b03052f651c6a963b858688
DIST mysql-workbench-gpl-5.2.47-src.tar.gz 21924533 SHA256 e6928beb157f1e0abbb8885d16544eefe4d25b05f54dc0fb75b8375d8775838c SHA512 0229c1c3e9b7082f1752cd3f95f4372d9af6bd83b89607f7e74b5460ad72b263b5c89c868ebe19e5182878122357113db0a782865042e096a1d4519733569e15 WHIRLPOOL 40455319a8001ae9365cd164702794be17aa134b254a6a79cfc15c2321a42dfbc463b59f6bb7a34d3d0252fca2b81310014928646d0d5d8e929c46b3de470cb5

@ -0,0 +1,43 @@
--- mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-08-30 18:05:12.000000000 +0200
+++ mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-09-08 11:41:18.723838826 +0200
@@ -18,6 +18,9 @@
find_package(PkgConfig REQUIRED)
find_package(GTK2 2.20 REQUIRED gtk gtkmm)
+if (NOT GTK2_FOUND)
+ message( FATAL_ERROR "Not all GTK2 components were found!" )
+endif()
pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
@@ -32,7 +35,8 @@
endif ()
# All known publicly available versions of Antlr3C are buggy
-
+# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973
+# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too
if (SKIP_BUNDLED_ANTLR)
find_package(Antlr3C)
endif ()
@@ -89,7 +93,8 @@
pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
pkg_check_modules(UUID REQUIRED uuid)
pkg_check_modules(LIBZIP REQUIRED libzip)
-if (UNIX)
+
+if (UNIX AND USE_GNOME_KEYRING)
pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
if (GNOME_KEYRING_FOUND)
set(KEYRING_DEFINITION "HAVE_GNOME_KEYRING")
@@ -99,7 +104,10 @@
set(KEYRING_DEFINITION "HAVE_OLD_GNOME_KEYRING")
endif()
endif()
+ if (NOT GNOME_KEYRING_FOUND)
+ message( FATAL_ERROR "Gnome keyring libraries could not be found" )
+ endif()
endif()
include (CheckFunctionExists)

@ -0,0 +1,98 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.2.3.ebuild,v 1.1 2014/11/09 10:31:31 graaff Exp $
EAPI=5
GCONF_DEBUG="no"
PYTHON_COMPAT=( python{2_6,2_7} )
PYTHON_REQ_USE="sqlite"
CMAKE_MIN_VERSION="2.8.11.1"
inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
MY_P="${PN}-community-${PV}-src"
DESCRIPTION="MySQL Workbench"
HOMEPAGE="http://dev.mysql.com/workbench/"
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc gnome-keyring"
# glibc: deprecated mutex functions, removed in 2.36.0
CDEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-cpp/atkmm
dev-cpp/pangomm
>=dev-cpp/glibmm-2.14:2
>=dev-cpp/gtkmm-2.14:2.4
dev-libs/atk
x11-libs/pango
>=x11-libs/gtk+-2.20:2
gnome-base/libglade:2.0
>=x11-libs/cairo-1.5.12[glib,svg]
dev-libs/libsigc++:2
dev-libs/boost
>=dev-cpp/ctemplate-0.95
>=dev-libs/libxml2-2.6.2:2
dev-libs/libzip
>=virtual/mysql-5.1
dev-libs/libpcre
>=sci-libs/gdal-1.11.1-r1
virtual/opengl
>=dev-lang/lua-5.1[deprecated]
|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
dev-libs/tinyxml[stl]
dev-db/mysql-connector-c++
dev-db/vsqlite++
|| ( dev-db/libiodbc dev-db/unixODBC )
gnome-keyring? ( gnome-base/libgnome-keyring )
dev-python/pexpect
>=dev-python/paramiko-1.7.4
"
# lua perhaps no longer needed? Was used via libgrt only
RDEPEND="${CDEPEND}
app-admin/sudo
>=sys-apps/net-tools-1.60_p20120127084908"
DEPEND="${CDEPEND}
dev-lang/swig
virtual/pkgconfig"
S="${WORKDIR}"/"${MY_P}"
src_prepare() {
## Patch CMakeLists.txt
epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
"${FILESDIR}/${PN}-6.1.7-wbcopytables.patch" \
"${FILESDIR}/${PN}-6.1.7-mysql_options4.patch"
## remove hardcoded CXXFLAGS
sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
## package is very fragile...
strip-flags
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
)
cmake-utils_src_configure
}
src_compile() {
# Work around parallel build issues, bug 507838
cmake-utils_src_compile -j1
}

@ -1 +1,2 @@
DIST 0.3.12.tar.gz 23720 SHA256 655d53abe7b21b024111565cf9da8ccaa90540e5ff36d7d227c2eaa22305e925 SHA512 5e134de01a3f2c8adab40ae4f598b5c3b095b7503bf1bcc1aae012d3b087ff68b7cd1fc4dbea74b8cfeac82e9a18428efccea3c1e5a229c2aec05f8228c28344 WHIRLPOOL 66c1252ecc2d05ad2a3690141efe4dace892a839b8b649cbf7b96e55de30bc5d384bd22394d94ca112b0f26380baf6b5db0a6c94d469b9cc5777986e9ae61842
DIST 0.3.13.tar.gz 28195 SHA256 73dea3c0b4b7769254da17182efbf9fc16893c50ed0d544abfdde127b69467d5 SHA512 70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e WHIRLPOOL 02d79a14dabbc7a2191f40370d94071c95c4dcb72f4eb6ba68b38872296a92473ddfd06a702bb6862fa2a5eac9ac921dd93e3312615bc587b319cf7a64ee5427

@ -0,0 +1,40 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/vsqlite++/vsqlite++-0.3.13.ebuild,v 1.1 2014/11/09 10:34:45 graaff Exp $
EAPI=5
AUTOTOOLS_IN_SOURCE_BUILD=1
AUTOTOOLS_AUTORECONF=1
inherit autotools-utils
DESCRIPTION="VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++"
HOMEPAGE="http://evilissimo.fedorapeople.org/releases/vsqlite--/"
SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz"
IUSE="static-libs"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND=">=dev-libs/boost-1.33.1"
RDEPEND="${DEPEND}
dev-db/sqlite:3"
DOCS=(AUTHORS COPYING ChangeLog INSTALL NEWS README TODO VERSION)
# package name is vsqlite++, but github / homepage name is vsqlite--
S="${WORKDIR}/vsqlite---${PV}"
src_prepare() {
## remove O3 in AM_CXXFLAGS
sed -i -e 's/-O3//' Makefile.am || die
autotools-utils_src_prepare
}
src_configure() {
econf $(use_enable static-libs static)
}

@ -1,152 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit,v 1.8 2014/03/30 10:14:33 zlogene Exp $
myconf() {
# the myconf array is declared in src_configure
myconf=( "${myconf[@]}" "$@" )
}
eblit-perl-src_configure() {
declare -a myconf
export LC_ALL="C"
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
# some arches and -O do not mix :)
use ppc && replace-flags -O? -O1
# Perl has problems compiling with -Os in your flags with glibc
use elibc_uclibc || replace-flags "-Os" "-O2"
# This flag makes compiling crash in interesting ways
filter-flags "-malign-double"
# Fixes bug #97645
use ppc && filter-flags "-mpowerpc-gpopt"
# Fixes bug #143895 on gcc-4.1.1
filter-flags "-fsched2-use-superblocks"
use sparc && myconf -Ud_longdbl
export BUILD_BZIP2=0
export BZIP2_INCLUDE=${EPREFIX}/usr/include
export BZIP2_LIB=${EPREFIX}/usr/$(get_libdir)
export BUILD_ZLIB=False
export ZLIB_INCLUDE=${EPREFIX}/usr/include
export ZLIB_LIB=${EPREFIX}/usr/$(get_libdir)
# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
myndbm='U'
mygdbm='U'
mydb='U'
if use gdbm ; then
mygdbm='D'
myndbm='D'
fi
if use berkdb ; then
mydb='D'
has_version '=sys-libs/db-1*' && myndbm='D'
fi
myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
myconf -Ui_db -Ui_ndbm
fi
use ithreads && myconf -Dusethreads
if use debug ; then
append-cflags "-g"
myconf -DDEBUGGING
elif [[ ${CFLAGS} == *-g* ]] ; then
myconf -DDEBUGGING=-g
else
myconf -DDEBUGGING=none
fi
if [[ -n ${PERL_OLDVERSEN} ]] ; then
local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
myconf -Dinc_version_list="${inclist}"
fi
[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
# Prefix itself we don't do multilib either, so make sure perl can find
# something compatible.
if use prefix ; then
local ldir
local paths=""
local scantool=""
case ${CHOST} in
*-aix*) paths="/lib /usr/lib" ;;
*-darwin*) scantool=scanmacho ;;
*) scantool=scanelf ;;
esac
if [[ -n ${scantool} ]]; then
echo "int main() {}" > "${T}"/t.c
# need to ensure dirs contain compatible libs,
# bugs #358875, #400839, use scanelf for #425538
$(tc-getCC) -o "${T}"/t "${T}"/t.c > /dev/null || die
local mtype=$(${scantool} -BF "%M%D#f" "${T}"/t)
einfo "searching libdirs for ${mtype}"
for ldir in /lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib ; do
[[ -e ${ldir} ]] || continue
if ${scantool} -BF "%M%D#f" ${ldir}/ | grep -q ${mtype} ; then
paths="${paths} ${ldir}"
einfo "found ${ldir}"
fi
done
fi
myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
elif [[ $(get_libdir) != "lib" ]] ; then
# We need to use " and not ', as the written config.sh use ' ...
myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
fi
# don't try building ODBM, bug #354453
myconf -Dnoextensions=ODBM_File
sh Configure \
-des \
-Duseshrplib \
-Darchname="${myarch}" \
-Dcc="$(tc-getCC)" \
-Doptimize="${CFLAGS}" \
-Dldflags="${LDFLAGS}" \
-Dprefix="${EPREFIX}"'/usr' \
-Dinstallprefix="${EPREFIX}"'/usr' \
-Dsiteprefix="${EPREFIX}"'/usr/local' \
-Dvendorprefix="${EPREFIX}"'/usr' \
-Dscriptdir="${EPREFIX}"'/usr/bin' \
-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-Darchlib="${EPREFIX}${ARCH_LIB}" \
-Dsitelib="${EPREFIX}${SITE_LIB}" \
-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-Dman1ext='1' \
-Dman3ext='3pm' \
-Dlibperl="${LIBPERL}" \
-Dlocincpth="${EPREFIX}"'/usr/include ' \
-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-Duselargefiles \
-Dd_semctl_semun \
-Dcf_by='Gentoo' \
-Dmyhostname='localhost' \
-Dperladmin='root@localhost' \
-Dinstallusrbinperl='n' \
-Ud_csh \
-Uusenm \
-Dsh="${EPREFIX}"/bin/sh \
"${myconf[@]}" || die "Unable to configure"
}

@ -1,70 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_prepare-v50180002.eblit,v 1.1 2014/04/30 14:47:53 civil Exp $
src_prepare_update_patchlevel_h() {
# Copied and modified from debian:
# Copyright 2011 Niko Tyni
# This program is free software; you can redistribute it and/or modify
# it under the same terms as Perl itself.
local patchdir="${WORKDIR}/patches"
local prefix
[[ -f ${patchdir}/series ]] || return 0
while read patch
do
patchname=$(echo $patch | sed 's/\.diff$//')
< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
# massage the patch headers
s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
s|^Bug-Gentoo: ||; tprepend;
s/^\(Subject\|Description\): //; tappend;
s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
# post-process at the end of input
$ { x;
# include the version number in the patchlevel.h description (if available)
s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
# escape any backslashes and double quotes
s|\\|\\\\|g; s|"|\\"|g;
# add a prefix
s|^|\t,"'"$prefix$patchname"' - |;
# newlines away
s/\n/ /g; s/ */ /g;
# add a suffix
s/ *$/"/; p
};
# stop all processing
d;
# label: append to the hold space
:append H; d;
# label: prepend to the hold space
:prepend x; H; d;
'
done < "${WORKDIR}"/patches/series > "${S}"/patchlevel-gentoo.h
}
eblit-perl-src_prepare() {
local patch
EPATCH_OPTS+=" -p1"
einfo "Applying patches from ${MY_P}-patches-${PATCH_VER} ..."
while read patch ; do
EPATCH_SINGLE_MSG=" ${patch} ..."
epatch "${WORKDIR}"/patches/${patch}
done < "${WORKDIR}"/patches/series
src_prepare_update_patchlevel_h
# pod/perltoc.pod fails
# lib/ExtUtils/t/Embed.t fails
if ! tc-is-static-only ; then
ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
ln -s ${LIBPERL} libperl$(get_libname ) || die
fi
}

@ -4,9 +4,11 @@ DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe
DIST pl-7.1.23.tar.gz 15840454 SHA256 6be163eec0dcfc985b3527f4c3839e4e2ba414a420f28bdaa9e6a01719e5fb22 SHA512 3ab20840cf2bf4b98193e215f429a11e5987052863d146ea3e5a0e0fb4e736a51ea6beea19d7e2011acf5ed74cc439facafb05d8dac01705da05cc871e3a7694 WHIRLPOOL cd933e68def4cb77ffbae6220ddfac7e72c9ae9c2e89df9c88d99abef1c7b69e1d0ea0b1847727baeb5c084622a2036255e9222f5a6db05c18b54d7b8a4dcece
DIST pl-7.1.24.tar.gz 16162934 SHA256 2482b9e984fa9100461f88fa6c5143e14a325dd14a9671222b7ccf04fa923470 SHA512 0206b6ce7f5d0a1e9b08eb0fdec6e934611ec141cce229fed6f5f79f467eea03459e1278a4320b25485c56442e47b626209d515ee94e8d979c042a92d5f7fa08 WHIRLPOOL d5e7ed56b0aebd42d9ac976cf6211eb44109fad7c14f80c676765541b0d1e67a8e04fd2047fcffa2f6b3ad0a0e1f9c4ff390fac96114c2ff6e7376c93e054463
DIST pl-7.1.25.tar.gz 16163694 SHA256 cf5ca6ea2dc47e7f6efc2510b6044d904ca6bd34de6bcca4dcb76730f083123d SHA512 e12b4d69498f6436ae1bd56edfb9024cda8760241b1a8d8c059b465b27243504763ed3093b126cc18af2cd123506bdcf6bafa182e4938183743808febe0b17d3 WHIRLPOOL a1f89751096308e99b988598d8ebbcde510db098774bafb2a1b9b83b1c80e153d96f151090a9913b48050d433b2667549f2de0837efabd2c0afd89e7b32b6c7e
DIST pl-7.1.26.tar.gz 16176826 SHA256 5c8e08a7cd8046e0c48cb42a2a68080b8a71bc92dddbd9e5d8d488286811e805 SHA512 034e9e9be10e3508d97da7a9a910fc9de236702d1a231f0c9d1d70b695487e2662152dab1b3cda52c15a6a03f3b4c964e6a7f80f337e3979dbd4349527ab7cdc WHIRLPOOL 826e31ea37c39ffa5ff2b450e26b0b52c041cb0a416c379f784ef62c820ba8437bb9f6ee190768d631b9033882f6e690ff787e0653efce80d6766126d6555d1f
DIST swi-prolog-6.6.4-gentoo-patchset-0.tar.gz 1596 SHA256 727a9ed67cdd8a23bc5d0bd5b2463353071370e58667a73c4ae403ef8a94671f SHA512 98d42047ec54155f7d34928bce3050edd65259b552ea82b763f15391f0283f5229a9a513e5f31c441294c5a7f2f2c4e6f133ff031eccfeaaf7c1037665240be9 WHIRLPOOL 3b4c0b6888e450176483bb5371c5f023864390852b9cf0d6f12b356a8460189e5e6cb85399b378c4b6bda314ce690e9a7ede1f79c74d78f033d7caff3a2fc408
DIST swi-prolog-6.6.5-gentoo-patchset-0.tar.gz 1595 SHA256 baf043ea3a145d8600ecb9c16722e8578b818b3018d50345e951084a26b018e9 SHA512 62f7a73af4d34b8a13378fb65302b01d2445b3e4f7198e293c4fd9b50948feaf632bd5de0af10aaf2cab9d5fcc214fe04d86e6e969e60b23d9bae4a277214041 WHIRLPOOL 95c6449b2248a0277af1cad70ebc16b46fd6b15d540822f1f9e5370760de94171bcdbb98df9915ce85e2ddda55eaf457eacb26b29f3ed4f61b1f69388454b0a5
DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
DIST swi-prolog-7.1.23-gentoo-patchset-0.tar.gz 1623 SHA256 a8e66ca8e4ec4620c8ccc4cb6e56f3b0a326bdb1331bec74ed8e51d1a82efc48 SHA512 a25be0b448f1af870b2b7941fed1887eed4c36e67590021523ddad7fddeb3a3d98f61aedf05af86718eda27f5bf1944e9ca4ebfbca683e065f06a9df2edb2098 WHIRLPOOL 4af49b09ec1106bc8e13a91de3eb93cbba0ae0b2fbfb4874869d053ea906996758107a694158b73a18b301ac79e537c861d8b07be533631cdcf86fba2b049d3e
DIST swi-prolog-7.1.24-gentoo-patchset-0.tar.gz 1860 SHA256 5ee2d8b3c4d7ccf949d57c2f29c4f674dc194e17720a8657a94222dcc7c7e7de SHA512 5532f0437d5caf962f3e1d10b9f69264668977e0e3d2de80c013e5d6c20258a29570d98013dc268cef62281e00c2eff20c9d77b8f257777abe8ab761f693ff39 WHIRLPOOL fc7878599be8e98001dbe7bfe6e4547fba20b8112c7b869250fe85cc8c71a691f03a1a7244029287523dbeee1d57ab53d24ca0155be4090f3ffae6dab97c6ec0
DIST swi-prolog-7.1.25-gentoo-patchset-0.tar.gz 1637 SHA256 cb0c94f0dbbd759b832401c122015fd1d4e422f594ced71f0c950025b23c0d84 SHA512 5824e65b165a14aa3cbb5bb8f0c968fdfaac75ba17b47f1ae93d8f96f0d06fa17f33a29c14c6a50db3b41da62d682aa9c933f58a9cd304f8094fac5483e85308 WHIRLPOOL 5d62e7f84abc92ed5c39eba8aff8e4845e8a8c757a5716b7218ea4fd73df6e1e430bb522372486408ab1ef43c80b01dbf7f52c3add2385f900f3023267db3a05
DIST swi-prolog-7.1.26-gentoo-patchset-0.tar.gz 1640 SHA256 5c7072fe31667c617225cfd40d3eae492a6e73299bb9d4cc1acebb95387ca440 SHA512 f025a6d02e2a65da9d0c30c8787fe0f2448eda24a1147442bb781afef1553ad1b530815dcdf2e1275c5291c3268d8336baa91cd595566e8055b4f487872d717c WHIRLPOOL a6cb4698ff6fd8d86dadd59862fac4a0863025c6041c056c07d762f72fefc334b1a08f376a8980193306ac33ad4021d5c0501fa74f26f50ab3655a8048e7ec74

@ -0,0 +1,128 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.26.ebuild,v 1.1 2014/11/09 14:55:05 keri Exp $
EAPI=4
inherit eutils flag-o-matic java-pkg-opt-2 multilib
PATCHSET_VER="0"
DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
RDEPEND="sys-libs/ncurses
archive? ( app-arch/libarchive )
zlib? ( sys-libs/zlib )
odbc? ( dev-db/unixODBC )
readline? ( sys-libs/readline )
gmp? ( dev-libs/gmp )
ssl? ( dev-libs/openssl )
java? ( >=virtual/jdk-1.4 )
X? (
virtual/jpeg
x11-libs/libX11
x11-libs/libXft
x11-libs/libXpm
x11-libs/libXt
x11-libs/libICE
x11-libs/libSM )"
DEPEND="${RDEPEND}
X? ( x11-proto/xproto )
java? ( test? ( =dev-java/junit-3.8* ) )"
S="${WORKDIR}/pl-${PV}"
src_prepare() {
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
# OSX/Intel ld doesn't like an archive without table of contents
sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
}
src_configure() {
append-flags -fno-strict-aliasing
use ppc && append-flags -mno-altivec
use hardened && append-flags -fno-unit-at-a-time
use debug && append-flags -DO_DEBUG
# ARCH is used in the configure script to figure out host and target
# specific stuff
export ARCH=${CHOST}
export CC_FOR_BUILD=$(tc-getBUILD_CC)
cd "${S}"/src || die
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
$(use_enable gmp) \
$(use_enable readline) \
$(use_enable static-libs static) \
--enable-shared \
--enable-custom-flags COFLAGS="${CFLAGS}"
if ! use minimal ; then
local jpltestconf
if use java && use test ; then
jpltestconf="--with-junit=$(java-config --classpath junit)"
fi
cd "${S}/packages" || die
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
$(use_with archive) \
$(use_with java jpl) \
${jpltestconf} \
$(use_with odbc) \
$(use_with ssl) \
$(use_with X xpce) \
$(use_with zlib) \
COFLAGS='"${CFLAGS}"'
fi
}
src_compile() {
cd "${S}"/src || die
emake
if ! use minimal ; then
cd "${S}/packages" || die
emake
./report-failed || die "Cannot report failed packages"
fi
}
src_test() {
cd "${S}/src" || die
emake check
if ! use minimal ; then
cd "${S}/packages" || die
emake check
./report-failed || die "Cannot report failed packages"
fi
}
src_install() {
emake -C src DESTDIR="${D}" install
if ! use minimal ; then
emake -C packages DESTDIR="${D}" install
if use doc ; then
emake -C packages DESTDIR="${D}" html-install
fi
./packages/report-failed || die "Cannot report failed packages"
fi
dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
}

@ -0,0 +1,105 @@
diff -urN tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java
--- tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java 2013-07-15 13:38:22.000000000 +0200
+++ tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java 2014-11-09 18:24:47.000000000 +0100
@@ -8,11 +8,11 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.*;
-import cli.System.Reflection.Assembly;
+//import cli.System.Reflection.Assembly;
import alice.tuprolog.event.LibraryEvent;
import alice.tuprolog.event.WarningEvent;
-import alice.util.AssemblyCustomClassLoader;
+//import alice.util.AssemblyCustomClassLoader;
/**
@@ -112,27 +112,7 @@
}
else // .NET
{
- Assembly asm = null;
- boolean classFound = false;
- className = "cli." + className.substring(0, className.indexOf(",")).trim();
- for(int i = 0; i < paths.length; i++)
- {
- try {
- asm = Assembly.LoadFrom(paths[i]);
- loader = new AssemblyCustomClassLoader(asm, urls);
- lib = (Library) Class.forName(className, true, loader).newInstance();
- if(lib != null)
- {
- classFound = true;
- break;
- }
- } catch (Exception e) {
- e.printStackTrace();
- continue;
- }
- }
- if(!classFound)
- throw new InvalidLibraryException(className, -1, -1);
+ throw new InvalidLibraryException(className, -1, -1);
}
String name = lib.getName();
Library alib = getLibrary(name);
diff -urN tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java
--- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-07-15 13:38:21.000000000 +0200
+++ tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java 2014-11-09 18:25:45.000000000 +0100
@@ -18,7 +18,7 @@
package alice.tuprologx.ide;
import alice.tuprolog.*;
-import alice.util.AssemblyCustomClassLoader;
+//import alice.util.AssemblyCustomClassLoader;
import java.io.File;
import java.net.URL;
@@ -26,7 +26,7 @@
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.StringTokenizer;
-import cli.System.Reflection.Assembly;
+//import cli.System.Reflection.Assembly;
/**
* A dynamic manager for tuProlog libraries.
@@ -156,10 +156,7 @@
// .NET
if(System.getProperty("java.vm.name").equals("IKVM.NET"))
{
- Assembly asm = Assembly.LoadFrom(file.getPath());
- loader = new AssemblyCustomClassLoader(asm, new URL[]{url});
- libraryClassname = "cli." + libraryClassname.substring(0,
- libraryClassname.indexOf(",")).trim();
+ throw new InvalidLibraryException(libraryClassname,-1,-1);
}
// JVM
else
diff -urN tuprolog-2.7.2.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.7.2/src/alice/util/AssemblyCustomClassLoader.java
--- tuprolog-2.7.2.orig/src/alice/util/AssemblyCustomClassLoader.java 2013-07-15 13:38:23.000000000 +0200
+++ tuprolog-2.7.2/src/alice/util/AssemblyCustomClassLoader.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-package alice.util;
-
-import java.net.URL;
-
-public class AssemblyCustomClassLoader extends java.net.URLClassLoader
-{
- public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)
- {
- super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));
- // explicitly calling addURL() is safer than passing it to the super constructor,
- // because this class loader instance may be used during the URL construction.
- for (URL url : urls) {
- addURL(url);
- }
- }
-
- public void addUrl(URL url)
- {
- addURL(url);
- }
-}
\ No newline at end of file

@ -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-lang/tuprolog/tuprolog-2.7.2.ebuild,v 1.1 2013/07/15 12:12:45 keri Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.7.2.ebuild,v 1.2 2014/11/09 17:38:09 keri Exp $
EAPI=3
@ -31,6 +31,7 @@ EANT_GENTOO_CLASSPATH="javassist-3"
src_prepare() {
epatch "${FILESDIR}"/${P}-javadocs.patch
epatch "${FILESDIR}"/${P}-no-ikvm.patch
cp "${FILESDIR}"/build.xml "${S}" || die
sed -i -e "s|test/unit|test|" "${S}"/build.xml \

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.22-r1.ebuild,v 1.1 2012/10/26 16:07:24 scarabeus Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.22-r2.ebuild,v 1.1 2014/11/09 17:53:47 zlogene Exp $
EAPI="4"
EAPI="5"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython"

@ -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-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild,v 1.1 2014/10/25 19:43:21 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild,v 1.2 2014/11/09 10:37:51 zlogene Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Facility for creating read-only scalars, arrays, and hashes"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="

@ -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-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild,v 1.1 2014/07/31 11:16:14 civil Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild,v 1.2 2014/11/09 10:37:52 zlogene Exp $
EAPI=5
MODULE_AUTHOR=LEONT
MODULE_VERSION=0.007
@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='A wrapper for perl'\''s configuration'
LICENSE=" || ( Artistic GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="test"
DEPEND="

@ -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-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild,v 1.1 2014/07/31 11:39:56 civil Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild,v 1.2 2014/11/09 10:37:52 zlogene Exp $
EAPI=5
MODULE_AUTHOR=LEONT
MODULE_VERSION=0.022
@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='Various portability utilities for module builders'
LICENSE=" || ( Artistic GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="test"
DEPEND="

@ -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-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild,v 1.2 2014/07/31 13:10:30 civil Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild,v 1.3 2014/11/09 10:37:51 zlogene Exp $
EAPI=5
MODULE_AUTHOR=LEONT
MODULE_VERSION=0.010
@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='Build.PL install path logic made easy'
LICENSE=" || ( Artistic GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="test"
DEPEND="

@ -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-perl/Module-Build-Tiny/Module-Build-Tiny-0.37.0.ebuild,v 1.1 2014/07/31 13:23:00 civil Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.37.0.ebuild,v 1.2 2014/11/09 10:37:51 zlogene Exp $
EAPI=5
MODULE_AUTHOR=LEONT
MODULE_VERSION=0.037
@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='A tiny replacement for Module::Build'
LICENSE=" || ( Artistic GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="test"
RDEPEND="

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mouse/Mouse-0.970.0.ebuild,v 1.3 2012/05/28 16:07:40 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mouse/Mouse-0.970.0-r1.ebuild,v 1.1 2014/11/09 17:28:51 dilfridge Exp $
EAPI=4
EAPI=5
MODULE_AUTHOR=GFUJI
MODULE_VERSION=0.97

@ -1,2 +1 @@
DIST SVN-Simple-0.27.tar.gz 4879 SHA256 e128b221ad6b0d93752b55f0c95655919788d702b180353890c469a3a428f75c SHA512 a8efba7650db740dcf6bcccddbd4e0c2ef9199f9032b77480f8b614d79866fd3310692c0d26c20911c6300ae71d41ff57a326918c9b9daff7bda4c11708aa81a WHIRLPOOL 2300a963d97711053741e974d565e00618272d4f659d5e6c20288853f09b968a0a51b3f763ddc85af27ddb7304ca2f3932c3366dbebd361ddad859815b6b9da8
DIST SVN-Simple-0.28.tar.gz 4952 SHA256 d63cc169e4369be98a539abe9cc1611bfcc2b36966a6517e676688fed1884ffb SHA512 ab64a4f005a8047a0c58bf0fcae27559f7400faab8192fecbc62be2348e1d00538281f4174e4085dfbb8395d8d8c050363508322d01438b58802f74830ecc1b9 WHIRLPOOL fc0d31d13e50af322ae08331f1d4ff88500821875b1a87fc28f58437edc7b226f8f3af57e290b95b3ada35367270af01b1d38a77ab9a7d6bc66672750eab4666

@ -1,18 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/SVN-Simple/SVN-Simple-0.270.0.ebuild,v 1.2 2011/09/03 21:05:05 tove Exp $
EAPI=4
MODULE_AUTHOR=CLKAO
MODULE_VERSION=0.27
inherit perl-module
DESCRIPTION="SVN::Simple::Edit - Simple interface to SVN::Delta::Editor"
SLOT="0"
KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND=">=dev-vcs/subversion-0.31[perl]"
DEPEND="${RDEPEND}"

@ -1,2 +1,3 @@
DIST crumbs-1.2.2.tar.gz 7721 SHA256 eb3ea05bab4ba34501e2d18da151d7036bfd68e948383d3f7303891463ff590f SHA512 be20aa24ef25d3fac1cba7e653b06e0ab394286032f7f01320c53ba88cff363a72d6302a44da7019acd3f2f04ea98d7a2f4d01b5f9f9cc0327391346a4a4ebf6 WHIRLPOOL 73f834900b19c2fd4dacb705ca6af5bc89fab6f8712115e3e894775c7bf6e5d87071faa2a5152350e1d7244751e2d6a9e07732c88e3ca40aae56ece560d77f72
DIST crumbs-2.0.0.tar.gz 13134 SHA256 776634a652205791f30419dbd3f89f26eecb0bf041348690f4552deb7f61ebc1 SHA512 b518041ed7d3d1026b83901f3ffa2faf1da30fb39c598eb88eebabfeb3489c4ce2b2de1f0267bdb3e7d9366509efe0e109f54ec45b9297345f1224c2de5213c5 WHIRLPOOL 64b7e09898c5861ab950fae1331ef973f4c42cc57e2204f23aaf11dce8eb84b817d9ee44b58acebbb909d1266a38eed419a615e8102cc76a46b4b41bb846592f
DIST crumbs-2.0.1.tar.gz 12377 SHA256 b537d608b9c54d8fc0bd73a4a60599fe2a68ba66ecd05f3f45a25d2301f439ca SHA512 d15a8f3484f8178a1d41555d1783fdf6356c97f05247cf3daf6c56af9e0bd2795ee187f7fde549f5e23b4883317608cc40a71dedfaf49e544c87a12a0f97738a WHIRLPOOL a74e0e61726ca7dbeb702ce92b369137b7c21da5e224a365c9fbf3e6221859c6307329447c6835ff824950d0155cf180d62616f10b6f3084cb041751e9e8d0c4

@ -0,0 +1,32 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/crumbs/crumbs-2.0.1.ebuild,v 1.1 2014/11/09 04:15:50 alunduil Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_3 )
inherit distutils-r1
DESCRIPTION="Generalized all-in-one parameters module"
HOMEPAGE="https://github.com/alunduil/crumbs"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="inotify test"
CDEPEND="inotify? ( dev-python/pyinotify[${PYTHON_USEDEP}] )"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
)
"
RDEPEND="${CDEPEND}"
python_test() {
nosetests || die "Tests failed on ${EPYTHON}"
}

@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/crumbs/crumbs-9999.ebuild,v 1.3 2014/09/02 21:32:05 alunduil Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/crumbs/crumbs-9999.ebuild,v 1.4 2014/11/09 04:15:50 alunduil Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
PYTHON_COMPAT=( python2_7 python3_3 )
inherit distutils-r1 git-2
@ -24,7 +24,6 @@ DEPEND="
test? (
${CDEPEND}
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
)
"

@ -0,0 +1 @@
DIST oslo.serialization-1.0.0.tar.gz 16242 SHA256 f9748cfbce1cb2a48942f12cf64a558f607135cddd610dadef8a036aa879063c SHA512 5cde309368b61f7fbf4ea6ece4c7e26bb1c43f4eb96adee8aea89810d81d0b112a1d8443b658f6d25558c0e9071b55ba81ddbea608bc51459afb3704ac9bd78b WHIRLPOOL 2c7dc9223e23d8df3e5ac0c3962ca1d8f66c3bf1f67943274aefc03245f65d312ab33353ea3dc8b63a748a785524b1e5a846361965f2c381fcec90dff51becd4

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>openstack</herd>
<maintainer>
<email>alunduil@gentoo.org</email>
<name>Alex Brandt</name>
</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>

@ -0,0 +1,75 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-serialization/oslo-serialization-1.0.0.ebuild,v 1.1 2014/11/09 16:38:05 alunduil Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_3 )
inherit distutils-r1
MY_PN=${PN/-/.}
DESCRIPTION="oslo.serialization library"
HOMEPAGE="https://launchpad.net/oslo"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
# Note: not in tree
#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/pbr[${PYTHON_USEDEP}]
test? (
>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
>=dev-python/mock-1.0[${PYTHON_USEDEP}]
>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-0.3.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.1[${PYTHON_USEDEP}]
>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
)
doc? (
>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
)
"
RDEPEND="
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-0.3.0[${PYTHON_USEDEP}]
>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
"
python_prepare_all() {
use doc && esetup.py build_sphinx
}
# Note: Tests fail due to requiring installation.
#
# Installation appears to fail due ot the use of namespace packages but root
# cause was never truly established.
RESTRICT="test"
python_test() {
distutils_install_for_testing
PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
testr init || die "testr init failed under ${EPYTHON}"
testr run || die "testr run failed under ${EPYTHON}"
}
python_install_all() {
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
}

@ -0,0 +1 @@
DIST oslo.utils-1.0.0.tar.gz 32719 SHA256 4d1fdb896eb7a690ddf2a04b47c347caefaf1117bb2be83723546fbaa5141864 SHA512 09c6b759f39eb90ec382f68f3cf70e600847bdc6c44802a82e279a10be75587fe5e67f5e5b136ab6ac338b69ff484a869dbf236e0e46fc72a90ca69619a53c9b WHIRLPOOL 470720887a248afc953c691ba8e659fb010b3b59708992a34387814487b3077f723879f603d931d1a14efd87fe95f868103ca7beaa8bb78c97a9510c28e8364c

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>openstack</herd>
<maintainer>
<email>alunduil@gentoo.org</email>
<name>Alex Brandt</name>
</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>

@ -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/oslo-utils/oslo-utils-1.0.0.ebuild,v 1.1 2014/11/08 21:51:51 alunduil Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_3 )
DISTUTILS_IN_SOURCE_BUILD=TRUE
inherit distutils-r1
MY_PN=${PN/-/.}
DESCRIPTION="Oslo Utility library"
HOMEPAGE="http://launchpad.net/oslo"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/pbr[${PYTHON_USEDEP}]
test? (
>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
<dev-python/hacking-0.10[${PYTHON_USEDEP}]
>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.0[${PYTHON_USEDEP}]
)
doc? (
>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
)
"
RDEPEND="
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-0.2.0[${PYTHON_USEDEP}]
>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
"
python_compile_all() {
use doc && esetup.py build_sphinx
}
# Note: Tests fail due to requiring installation.
#
# Installation appears to fail due to the use of namespace packcages but root
# cause was never truly established.
RESTRICT="test"
python_test() {
distutils_install_for_testing
rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
testr init || die "testr init failed under ${EPYTHON}"
testr run || die "testr run failed under ${EPYTHON}"
}
python_install_all() {
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
}

@ -1 +1,2 @@
DIST peewee-2.4.0.tar.gz 321905 SHA256 f038a1e37645c4bb643b8a0d85adddf79749e3a201003ca95040195473f46cfe SHA512 182be593ec1679cd635b77897e097fbd6b9329caf212db0de4f8de6940ba6f8c3b5788ccb0cb0086ecb7f2a560ce92fded224821956e5c31384daaa7cd819a89 WHIRLPOOL e968641f1d238b85e11b026d413080bbb78052e057538fea82cf36dbebd196f1d2846b126cc52ffbb17f9ed208609260973f302e146a361e90a93964361c9c81
DIST peewee-2.4.1.tar.gz 318713 SHA256 43ee524a4df8601306ae4009ba2492a72a102f75501cce39873d7a22a8c512d0 SHA512 497abf616716b8b9a9cc8b41828a3bbd25d398791f41a57808c398cb79c5121f884c9de909dc61fd70f09f37fe1bb754a5cf23b276218c4e04f2d0581699b9de WHIRLPOOL 395e98635691ceb71ed20e3223580183599e312df309a3775ad8bb505fe0af756074efab3a4f34bba64500d0cad6849dd5016a6531f79b1e6b4389312430d426

@ -0,0 +1,42 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/peewee/peewee-2.4.1.ebuild,v 1.1 2014/11/09 04:31:48 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE="sqlite(+)"
inherit distutils-r1
DESCRIPTION="Small python ORM"
HOMEPAGE="https://github.com/coleifer/peewee/"
SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc examples test"
RDEPEND=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/apsw[${PYTHON_USEDEP}]
dev-python/psycopg[${PYTHON_USEDEP}]
dev-python/django[${PYTHON_USEDEP}]
)"
# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
DISTUTILS_IN_SOURCE_BUILD=1
python_compile_all() {
use doc && emake -C docs html
}
python_test() {
"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
}
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/html/. )
use examples && local EXAMPLES=( examples/. )
distutils-r1_python_install_all
}

@ -1,4 +1,4 @@
DIST pyparsing-1.5.5.tar.gz 1412611 SHA256 d1754df0801871d05a96f1cef50a4f32e5d40d49ea24aa1c6ca9529cbd562005 SHA512 e270cb0e5f5b47c474eca5005467eac9e9ee3e7fe4017cd5f4fd774658b57eb52bd868c4e42964bf441a2048e12aecbdc05fbdcca3fc61e04eaba248d385a858 WHIRLPOOL 492c535cf540bd841a0904ae2226f7e76be8d65f96b09c7e31a0e35bd069eaddf52ab1be3df8ed6fcc01f0315920b93bfbbe031b2ec0ecdecd46abea2b820106
DIST pyparsing-1.5.6.tar.gz 1418892 SHA256 5c84aa4500e82d5aa2c0842d5628c5da985e68ac1fb33554e0e5547eb3c85a75 SHA512 614c1a016d121b7c4ecf90a164bbe323affd6cf72319c8494e9a583078ffa233c351627fc3e793307e407e043570f8301f112c4d86645dcd130220ed976289c8 WHIRLPOOL 278d37581a950a570ac3cca2a5f8b674c909220fddc47072d9d52c38b8dfc30b335530dffd3c522cd18e58e9bddcc5e48d9184cdaf4b09203bbba308607e24a4
DIST pyparsing-2.0.1.tar.gz 1129563 SHA256 0007cd3f008eba4a203f1f6b4b133ddc352552c8808b694c88c23db56416e4e4 SHA512 e9c9307c59c7020f4a454458703bd1eb4ef0ac513b2a6a07706b5d676c010f33a72d03d78a61bf3daa96d6598b966a3e4921a88c50f71939a697fa00377ac67a WHIRLPOOL c95815cc6d8471e1ea730daf19ea954fbbddbc67b771700100b04c7103e1ec5e7226e3881a037476f898a3874c072baed7ed159ca32566bd8ed825ab8f4f3cbe
DIST pyparsing-2.0.2.tar.gz 1136568 SHA256 17e43d6b17588ed5968735575b3983a952133ec4082596d214d7090b56d48a06 SHA512 453348c82aaee0565896194711b960de591a0e6651434c596e6cc18fbc85e9a96965d341455d25097c8f1b8cf87781f3374fc4f066496adbdc9dd94450ceffcc WHIRLPOOL ca8cae8306a051e5e0e2d72d9337b8ea74a0d9f024849eb555bb96737e60baa629d79c940017515a74171bc79973148ed2606eb2ea18ada7734503bd331d3507
DIST pyparsing-2.0.3.tar.gz 1462653 SHA256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f SHA512 9771851f4b0191c7d3f8d2a2a6d2a9198b173120d3f133d08284b71e792fc59a906d571edea8f44ba04ab00c1d906e1974d1e8a2d6155d492de1358ba99c575a WHIRLPOOL 42b9c7aa0b8d4d91436a01a60cbca64a9c8f7798b7aeb60bd2c4af085f9e13167a5ac5132d55bd890b4890c00428e908dfae32ed78ec153c868ee02ed3cdaa3f

@ -1,41 +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/pyparsing/pyparsing-1.5.5.ebuild,v 1.15 2012/03/31 17:26:00 armin76 Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
inherit distutils eutils
DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
HOMEPAGE="http://pyparsing.wikispaces.com/ http://pypi.python.org/pypi/pyparsing"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc examples"
DEPEND=""
RDEPEND=""
DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
PYTHON_MODNAME="pyparsing.py"
src_install() {
distutils_src_install
dohtml HowToUsePyparsing.html
dodoc CHANGES
if use doc; then
dohtml -r htmldoc/*
insinto /usr/share/doc/${PF}
doins docs/*.pdf
fi
if use examples; then
insinto /usr/share/doc/${PF}
doins -r examples
fi
}

@ -1,50 +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/pyparsing/pyparsing-1.5.6-r1.ebuild,v 1.1 2012/11/26 08:01:29 idella4 Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
inherit distutils eutils
DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
HOMEPAGE="http://pyparsing.wikispaces.com/ http://pypi.python.org/pypi/pyparsing"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
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 examples"
DEPEND=""
RDEPEND=""
DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
PYTHON_MODNAME="pyparsing.py"
src_prepare() {
# resorted to sed, fixed in June upstream, bug ID: 3381439. See Bug #443836. Unexplained delay of release of 1.5.7
sed -e "s/26 June 2011 10:53/16 June 2012 03:08/" \
-e 's:exc.__traceback__:pe.__traceback__:' \
-i pyparsing_py3.py || die
distutils_src_prepare
}
src_install() {
distutils_src_install
dohtml HowToUsePyparsing.html
dodoc CHANGES
if use doc; then
dohtml -r htmldoc/*
insinto /usr/share/doc/${PF}
doins docs/*.pdf
fi
if use examples; then
insinto /usr/share/doc/${PF}
doins -r examples
fi
}

@ -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/pyparsing/pyparsing-2.0.3.ebuild,v 1.1 2014/11/09 09:56:22 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1
DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
HOMEPAGE="http://pyparsing.wikispaces.com/ http://pypi.python.org/pypi/pyparsing"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
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 examples"
RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
python_install_all() {
local HTML_DOCS=( HowToUsePyparsing.html )
use doc && HTML_DOCS+=( htmldoc/ )
use examples && local EXAMPLES=( examples/. )
distutils-r1_python_install_all
use doc && dodoc docs/*.pdf
}

@ -1,21 +1,5 @@
DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
DIST pypy-2.2.1-src.tar.bz2 14439822 SHA256 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f SHA512 68b52c5b1a9b96593aa1dd38ad0b1b7b282852008e3ae3c488a5e19ab2bede68e2b40afdb79d85a4ab21cb1da6647b8b958fcefe34c99a1f6cbc1a19d695d3b6 WHIRLPOOL 6eca63959d8ee5663f868daaaac32ad1180b07e2f8b63d839652902095a098ffbfa29c6f83451733270a4b2f73b65450cb3b80a878b9dd1ec71089bfff11e9f6
DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
DIST pypy-2.4.0-src.tar.bz2 15390145 SHA256 7e0dec2c40106f20f002121bdabb71939915254fb91bd55b01434e4b994113d2 SHA512 b6e0c48a16e842374c400dcf6cbb01eebb33fee35804540d3aec52d2612c4093a9c57f3b2569176784b9b6ba8af428c0c238ff6db45a1773d8edbc44cc615598 WHIRLPOOL 8d80c89d3026215ebea3893f3c37dc431ae9ed3c381f3faae12c7cd25a2bb7beba583f8aab0d813429339c0f3de1f345550b5b9228b480c58ab7daa2a7b39ce1
DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9652340 SHA256 100c1119fe08c47d1a15ca6c98b91c510f41c670d87526fb392e3b292d791ac3 SHA512 ac8d91e740fc8a49860ec47717b160a59ac68807aabd8ddc3a578682d6d75d3ddd47bc5e8b7db6e2be0af5f9414596831372225ab657194ba72d22c2360f98c0 WHIRLPOOL 5dc07128fc8db9df062053803a2792eb6f3795cf2cdef5d011a594c73a158bb4061fcd862c39eb074805f0b4e46d0846708f3fd0fdf3464b02cbe8efa406bb1f
DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses.tar.xz 10469416 SHA256 4f8a64d8cc679b8ba6751fc47307df679bca2658848d009c8c724682c76fbf0a SHA512 1d1bedc80d12982074a09516674bee71e57bac9b2b9dac1d9834295edb3b8fb79c0e93de708eef0dbf232dd198a4a728b09a9f86ab5dabad8a293072446b2a2b WHIRLPOOL 08753da5e1e6361bd21b03813cb4482164cc2933d8bf2a2d7443379b1be1b6ac0b87fde571af8519e7fa9e14893bb570799ad6dae02ba42a936dc4d964b0e821
DIST pypy-bin-2.0.2-amd64+bzip2+ncurses.tar.xz 6527192 SHA256 ff2ac88da94978388b20d54b0a2add839facc5e605c54cc7bfd96faa088ec266 SHA512 58b9e6acc9038b4aeccadf0f1dd257b320cca8e536edd2835c0d9b95f27268b3b71e3af59daa4033580f2fc43f590205e1ed6de2fe475c60cf00c1a781ad1f86 WHIRLPOOL b5410e2b7a0816dffb64b32169be82193820c345d5b4000dc3fd8f827ce82a783fe62605efc0be7794d38dbdeb59d68cf0ac46c62f24f4a8025a2506739db4d1
DIST pypy-bin-2.0.2-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7754056 SHA256 b10da2cede4c04299730ac3e001b269b81c42584b8b09bff78098fe94218a78c SHA512 b512b67a4de9bdacb1f4e13888fefd4ed2ca4bb9ca3ffecafa825e6ddc36bb62cd4eff34e23c8f9a4baf9f601544cdb59d5249a240932109d98dba532e2915d1 WHIRLPOOL 187cbe9e2778243ff7c82ca4fa25705ff78be216dc66547a4f4f4b78eba4854ce11b843170b76cb17ea34d85647dfbdb664b4394c3641ffe364e2f91eb21e9aa
DIST pypy-bin-2.0.2-x86+bzip2+jit+ncurses+sse2.tar.xz 9000040 SHA256 cc27253d53cca461e4d4aa8ca3943cae783d4d6389b99d3b7f9f88055d3cf6bf SHA512 90fa4762933a3cbed297a5eb8f1e95fbc70ba02286fc66beb012f27dde1cd06c8eeff0fa2d4a32586d84acbda2608530880d3cc14ea099e3debd239d3c154780 WHIRLPOOL e5a241d3b15aff2bda92f578c2aed7ccc9fbb68f45baaad75eb7229a30dcaabefd6d81cb883f4de7122459a91c521a8c1e6f332500a3f73fa546a42a2e60cfde
DIST pypy-bin-2.0.2-x86+bzip2+ncurses+sse2.tar.xz 5132392 SHA256 8d434ca55cf969016e0c739b4671b97981f9af36b3937c4f4c1acba4d54df8fc SHA512 cb7ba91f1bb6b67f540e5b573bcc27ae92741407e44e204fb401a6ac38653ecdd2a3084b53216f3ed209279a3d01725d2b7d174e6f7d1038da80d448d40b00f1 WHIRLPOOL d171742333d7209ce2dcd50b0ab8bd2e6382c8bb9f0d7a5d69d2268217afdd155abf5c41a96f9bad18c2606b2f554b7a8ef2f1e943ae41412270582b476cd345
DIST pypy-bin-2.0.2-x86+bzip2+ncurses.tar.xz 5137536 SHA256 c34e60673346b59022560608f633962dee47d79b96e4015677e86f507ad61248 SHA512 0d737a7d5018d6a4d70d3c0921ed4d8882bce4e6f9ff2b9742ab1763cc760a4ed22fcf683e4e7a1693f35897fa4d20500e6d5a31803e34b15175f4081a2ec6d8 WHIRLPOOL 04de2b1aa32f1a098d38b2b0512822c24385bed9db94f0cad03611a45e189812654f2f33ea6dad1a71a77bab878a8109ddf9c8873dc127a49352adac2a8ff7df
DIST pypy-bin-2.2.1-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9607224 SHA256 458c2d76d86998db9fd3bfb910bdbab87251ae658f52a916baeefeeaa62d0f67 SHA512 5ec70946ff0c7664bacdcb5a03456a1cb3ba56bba80e1781b0544eeae1626329523200e31ea449c58833c0288841b4016e375a9e4cd2035b4dc4f71b0de31187 WHIRLPOOL 156edb8f57e9dbe8e5d2995a6dcff82ea9da38537afbb79fff99cc762f6b2aae3090cff0105b06accb857a5702fc4f3efee33e56a58f378c2773cd8338613c7b
DIST pypy-bin-2.2.1-r1-amd64+bzip2+jit+ncurses.tar.xz 10297432 SHA256 83ee64cb1ea2a333bbcc4ae46078940eba5444790b994e021746d82a65984c6a SHA512 cad7056b41db3bd1f1ee4028c89953ae7cdecdb2f6dd8c58d2f5d86b67e27bc472575dac332b55946efa755216fed7bce457e773c6f992adefcf5225ea3dcaff WHIRLPOOL e63197858bd97a69f3224b65794963291393d7064f22b025954681df412ecce3d8b157eb65fc1bc3e4a85fb4c4d9b4ea45c6804c907468ae20f1f13ac028fa5b
DIST pypy-bin-2.2.1-r1-amd64+bzip2+ncurses.tar.xz 6493176 SHA256 ad0c6befaad066082dc19f833981c6136fca27d7e803b2de6e7b7cb237b831e7 SHA512 331d7bb36afd400af0824c71825fccec7bc3f9b3e8131443ece7d654e5897930d278f4e6be71a034794ec96cc3217f017237df09c7113f23a3994582f9ffef1f WHIRLPOOL 0eab078d234bc91d94c926c57b85c8f7ac5cda7fce54ccd77830b27d3681df8ac323f29f089dfa0334b909a89ff627fa4381d5b751b8c8cfb0e11700d58683a0
DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7789720 SHA256 f3538c4f4496cce6199b155e384e50dd43a174416a2399220e7ab8634ec7bfe0 SHA512 2e294241bc7fd00486d999ffd5349c5c7a5debf8e24f0411dec4901cb8e5ab4edfc822591f68182df7fb9fed2505a3a0aed0248584ee2a4d327332f610f88564 WHIRLPOOL c4220cf9e8bc09898a268e007ccd08a89d2e54b3b0174ab7c6961de32039ebc8df6e5b3a0b47dcabb82d4e2c9669ddc72808b3a9f4802671861593aba26e18ea
DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 8981480 SHA256 e965e343bf5e43c2f21e1bb9317a22f06ebc07c57127ffdb6ed5a9768a834e0e SHA512 1731aa4db600fb5cf79f17607a0e68321c5be5d969acafa249708e9b91a3f4b5fcde96a64c85f2fbd8977ccae288e3e9b31531dbdf090bc816a783c06b983b5b WHIRLPOOL ed03fbe804127b33b853df19a7462b40931826cb906e60f645737bc7df17870132e8a68bfbe55e6c7a79fc971e2c93e63e6e897da6ff29da0aa1c0998c848f51
DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5179532 SHA256 2cc4e6208303ed64a09e9769a866523217dadfb81322ea0dc931e6d4f2cd757c SHA512 3bd1b3a45c60461294eee63d25f4f71c93289d5aa18193585a478dae343fd2930cf3f2ce0ef001fa33b3a6c77abc26842e4941f0573ed163c8a60feb0fe6ff51 WHIRLPOOL 536a6dfbc6f11fb8e3d3f3fab232263e4731ec97cc3eca4c952042c747b30f761821bc4ddf7c7e896d9692d555a5b5fcb6057f3c3c31e8f8cd6bc9edbbd88503
DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses.tar.xz 5179732 SHA256 2889b1b3e0af8d7a763f9d237295ab181c9661c0f57d26e799c71d28df388714 SHA512 ce34e0cb0d362381ce6ba8fab84a55463d2c4cc0834df550e0823b6ec97d762386d382ba1a7a5e039ef531070bfa27ed76c88326a48f948cb9f82af78fda2391 WHIRLPOOL e6cc06898e967010d30d225a4ca59b70080da3763e0ad153211719bc99fd707ac8ee8d28ee2c286f87404439424ab59ecf7332162658f0b4cb0a3efbac35f54c
DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b
DIST pypy-bin-2.3.1-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10724632 SHA256 e897fce8057d6ffd8a8f66ddd3736d82c4edae9e30bf0622b5695c083a5f249d SHA512 b3b9ccb63bf2922c734874d745a40c49d5af1e9d9a3a1188c31040fef20faf4fdc00ac1be90ed35848e09bf86dfe5552a720b7c5c4d845777fc85479b515dac6 WHIRLPOOL 583864f5923dc0e0ee59e2397d1ed0f7ecd027605470bb2462f70b40338167f932a235fc40bf0b7349d9facdb7b1a07d86ff46ccc296acc3bb0f21cf7f8709e9
DIST pypy-bin-2.3.1-r1-amd64+bzip2+jit+ncurses.tar.xz 12234132 SHA256 2169569b4f85869607d4ba7fa57852f954815a9bbb344da4fa842fbc59e4081a SHA512 7484fa22d79dfb1970c926fa27579184f3a38548d8072c49f239f31a8dc5549786776c27c0aa28583736f144e16ea0edb6fb8be81c0e394af783c6916e775cc1 WHIRLPOOL 3b1124526531cbf86e503933e8294ad7d11cb0993c1d103c59ced46830323e7e7c540194a13880d46b730e7b6498b1b48a1a902766948d28379ccf1020f05f35
DIST pypy-bin-2.3.1-r1-amd64+bzip2+ncurses.tar.xz 6893836 SHA256 e547e1c5674e53e955373f44ab2ef7ef81f0f3f27240070e634c72b666428456 SHA512 5cb35f6a88aea9e92a8bbbdd873235e8b0b5bcce52d749dd80f68ddb7127eae27122ece74e13c4a2360a0dd65449fa7207a5279f0195732946f7ce8f8aa54142 WHIRLPOOL 4eaa864a456fc29a3731801901f93b62b559eb1bd5867f790840f8f8de1c98fa63bc17bd3dec0f9de82d8f639c2ecf8d3831555503c0089a727ff820c525b24a
@ -23,6 +7,10 @@ DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 9114380 SHA
DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 10074824 SHA256 1a15019bf2c1bff57833c0061e2074e48222142919d32b5e8349f5fc2d2a7dc9 SHA512 a99e880e08ecb0cb802ad78f4c6b20017710875503a1fb73bc3e8c5a7710bbbe1d2d3f57f129b4e815fb9576a5dd92731eccd485915f9f036a227aeaecc8a270 WHIRLPOOL 193e0b219e7398a4937d092684447d633dfc66dfbff5c174280bed6b0e31d4230c6c9847de6fed0ddebfa96e9e76aa5edffb0899542c0cabfc688ad24b9c24ce
DIST pypy-bin-2.3.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5996472 SHA256 cefe34845216e5d7f5a51e318c5449aad867987044849e61fda0ce5486e68c5f SHA512 df07645f87d29b75da9f9d2213922562b4059ebad23da43d8d0eecc3e5fb95feef990e76e54c2dd86712a253db41d64a70d464f9ff7d8e1fa72aae648c888b92 WHIRLPOOL d806f691fc0200b9d470e6508c4217203892ccc7f2f34045952ce111b2a8ec2027d14e6030cee22c3681817b8f6d66ada49fdb62b32a583751494fd605b08dc5
DIST pypy-bin-2.3.1-r1-x86+bzip2+ncurses.tar.xz 6025904 SHA256 e8aa0fa467daca78cb0231339d3267ecc396faf7b7b992b160bb65f76b65ba19 SHA512 291d11f2cf9115601dcec95876975d694cffe6b8d156ef91463d17d0de26b13d9ad0d773fdf4f126a9a24fc5fe41dc254df36a51e0f1dd8c1c5fa81155d128f2 WHIRLPOOL 98a8e68fdfea8be8efdd2445aa449f3d32731eb6ab2727454e4c0474025316ce43dfbd0bb2fab3cff698401994c76444133e95df3590894cc733f97f3f541539
DIST pypy-bin-2.4.0-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10283108 SHA256 e202908d2e3c24f9b08c29d32168af487cadf01b7e728bba7d8f299dd4b60df6 SHA512 b93a069368b390a070c06309ed0b8ba1d9bd922f7935850bc7638f554fdff3a0e0c5cef1a7c45fb115e441cff72e5f80bcf2444c915526ac529dce4d622e2291 WHIRLPOOL 7f82630cf144036ea21415155f13200b2c06a0c571d048e9ee912017524806239668b62e03c6927b88bd0c6adf1029b5344292bd6c572714cf7853192d6a0055
DIST pypy-bin-2.4.0-r1-amd64+bzip2+jit+ncurses.tar.xz 11639092 SHA256 77d4377adb3a8ae682aa8b3d2dcaab03610a8822a4b5189433e95358f9deb431 SHA512 315a243d4979ecd6699a2d39b7aec4497b92bd704b2b86d15433e126005aba073bada9667fd59b98847a139230073ef82da65cc12c720bc5f417b54e1abb84bc WHIRLPOOL ce2245a489617ff2b583452bbf6b4ad724a1aab4582085f500a6c3c9d65f77fb48a16a3ac2953252509ebb2daea4ec10739d3c0ad9d5dd98628bda88b4337cae
DIST pypy-bin-2.4.0-r1-amd64+bzip2+ncurses.tar.xz 6603856 SHA256 6670aa2e074e1308c7dc7d8d616a3c7bf59af479eb83c1fd9d40dccecd2019d8 SHA512 7510ae4ae9e2bf428adb57beec12f50a910af121f5df8f4f0b5545c309969393b499d63ed4f4a8cf7fd0e9a2ca924bb14bd45fee0bdb122a8edb9ba9e39382bc WHIRLPOOL ad26729e8bbe4cd291f1e826ad221a17f922bd063f521d73db992334a33f94f26ee3aaaebc6e2ed4870f7505d97ad443b45a4d80e5ec6d6708569d23dd0bdbfc
DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10238896 SHA256 158ebb6bef9e77c0ea84ade4449717a608f3e2378b18a198a15187f49f240262 SHA512 3baa4387336ee343949ff7a04de236ef6da1446efa9ae565a61abd6d5d3915d54b51d91d4958b8c1ec61d894943804ea1158c0618349fc4c9e52a8956a4afa56 WHIRLPOOL a2803b6f42a35b74761af918be7c33a460bac246fdaba3c1ca34b3dcff6bbe1f68a1a4299123ce167664516b7e29bc8450cdb6be196313657f2178259b3783a6
DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses.tar.xz 11771744 SHA256 4a05b8819486693c83af7cf45092926526f5511615b6d4181f72e11ac240f263 SHA512 d8e5c1c1721935fe73254fc3037176ad3c71d96acd55d8bcd15bc7b317a72261b7e08a6ae28cb62bfb2203f06b13839670b5da3e435cd87c0f65fea259be2732 WHIRLPOOL 496f244487146e1acd34981b3ec4af81590b136b884f0cb698fc35698cadfad1e278ad627563fd643294c49e1ea27f05c180dd05b3f6d2d4079527775ef4ec90
DIST pypy-bin-2.4.0-amd64+bzip2+ncurses.tar.xz 6596304 SHA256 f2f2fa539ec1f3fd048bd81bb5fa54f260980fe9689c578f134f39ecf00aa027 SHA512 e8603ba08a11c1cbd9d3af824aca1c4ae7b61d46879b398d5d18428bc438c2e0bd0fd9ecd83f100715b635968eee3805db18a42ab62fbc10d8cd0186b6998431 WHIRLPOOL 2758fc778a1f9e5db966aa1e5a47a8da8c1fbb5882aa74ba9709c23e1b3a546c826de8ea4ba83e5baae262a51636d7201445102c97d4c749a98805a46aeac9ba
DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 8596232 SHA256 3fded027e8e70fc11ec793b99ec18bde7893c54122492e5599fea59049b3a5fb SHA512 bac9647580cbee99e327d436a02c038a621aa6f4b2635b3a392218c76a0690bb9a8f3a3f79520c716cffd30a613874a1104114c287e130e2c0eadb5f3a5b05bd WHIRLPOOL 00f646d55093ea07abfe1f8ac9e354f8bb39a2dd3fe2925436583ad6209e6da0c34476b29832de4274dfe516d70db5ea6345e23532925ed09360464d4405b926
DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+sse2.tar.xz 9511800 SHA256 5178ce53d9da16a0d989797dd909677aaec4a8d4a936a4d27d8be1ea248489d9 SHA512 4910c72ea0b0849245657772eebfc598779f4a3eb077cec7d6e735c8aae3564ab064f9462fb0576f18792df2459d6c8f372578803497a83e4525671ffe0f8054 WHIRLPOOL 1ae421817e5f5f30ae7e9c446b4afe024de7d271a4fd8185002240e942c96dae93d45e80f6fe794dcb4a1c542a5b2ba76ab1ee81702e501de53861901ba7092b
DIST pypy-bin-2.4.0-x86+bzip2+ncurses+sse2.tar.xz 5655980 SHA256 fcfbd71b903e9c6a26cd6590090d8d0c2f8c507e9f4650f7972f36a8ef86fcc6 SHA512 45d71f2d785a65091c9f25376bcb2f7f7e02cf1f00111fcb4b0a3bf0fc5e56947be7f66f5281744de31424f9e0b7249523a4bcd5fec7bf4f3c829b66598b02af WHIRLPOOL a9fef84296f9e77062b0e0cb17537615a02f3ba7d0ed804cf63cce9baf7c1ab843b326301bde5e5a33744b716ea0efd4619e9ba55c0387acfa1622aa11b875de
DIST pypy-bin-2.4.0-x86+bzip2+ncurses.tar.xz 5634780 SHA256 2d0494fdab270c26efbe84fa42118b822b3fc021940e2d260a5c39938dcbed8d SHA512 672468e436646ed0334352addeda824ddd76a4cf1ad46231983aec7b697ae6ef2cc2b9072ae5149b4b0987b06caade65ab8bf67ca1dea10219030a9b3fd5b4b4 WHIRLPOOL 003bf4ef085b01c6625f43d34bdcfc2fa035e93373197c67540548856b160db39aed8f0a319ff3f77063dbb8abd2b6a4b412dccbab8c6a70689cf701cf98c4cc

@ -1,323 +0,0 @@
http://bugs.python.org/issue1222585
--- lib-python/2.7/distutils/cygwinccompiler.py
+++ lib-python/2.7/distutils/cygwinccompiler.py
@@ -132,9 +132,13 @@
self.set_executables(compiler='gcc -mcygwin -O -Wall',
compiler_so='gcc -mcygwin -mdll -O -Wall',
compiler_cxx='g++ -mcygwin -O -Wall',
+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
linker_exe='gcc -mcygwin',
linker_so=('%s -mcygwin %s' %
- (self.linker_dll, shared_option)))
+ (self.linker_dll, shared_option)),
+ linker_exe_cxx='g++ -mcygwin',
+ linker_so_cxx=('%s -mcygwin %s' %
+ (self.linker_dll, shared_option)))
# cygwin and mingw32 need different sets of libraries
if self.gcc_version == "2.91.57":
@@ -160,8 +164,12 @@
raise CompileError, msg
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
@@ -322,10 +330,15 @@
self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
compiler_so='gcc -mno-cygwin -mdll -O -Wall',
compiler_cxx='g++ -mno-cygwin -O -Wall',
+ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
linker_exe='gcc -mno-cygwin',
linker_so='%s -mno-cygwin %s %s'
% (self.linker_dll, shared_option,
- entry_point))
+ entry_point),
+ linker_exe_cxx='g++ -mno-cygwin',
+ linker_so_cxx='%s -mno-cygwin %s %s'
+ % (self.linker_dll, shared_option,
+ entry_point))
# Maybe we should also append -mthreads, but then the finished
# dlls need another dll (mingwm10.dll see Mingw32 docs)
# (-mthreads: Support thread-safe exception handling on `Mingw32')
--- lib-python/2.7/distutils/emxccompiler.py
+++ lib-python/2.7/distutils/emxccompiler.py
@@ -65,8 +65,12 @@
# XXX optimization, warnings etc. should be customizable.
self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
linker_exe='gcc -Zomf -Zmt -Zcrtdll',
- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
# want the gcc library statically linked (so that we don't have
# to distribute a version dependent on the compiler we have)
@@ -83,8 +87,12 @@
raise CompileError, msg
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
--- lib-python/2.7/distutils/sysconfig_cpython.py
+++ lib-python/2.7/distutils/sysconfig_cpython.py
@@ -150,10 +150,12 @@
varies across Unices and is stored in Python's Makefile.
"""
if compiler.compiler_type == "unix":
- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS')
+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
+ 'SO', 'AR', 'ARFLAGS')
+
+ cflags = ''
+ cxxflags = ''
newcc = None
if 'CC' in os.environ:
@@ -191,19 +193,27 @@
cxx = os.environ['CXX']
if 'LDSHARED' in os.environ:
ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
if 'CPP' in os.environ:
cpp = os.environ['CPP']
else:
cpp = cc + " -E" # not always
if 'LDFLAGS' in os.environ:
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ:
- cflags = opt + ' ' + os.environ['CFLAGS']
+ cflags = os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
if 'CPPFLAGS' in os.environ:
cpp = cpp + ' ' + os.environ['CPPFLAGS']
cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
if 'AR' in os.environ:
ar = os.environ['AR']
if 'ARFLAGS' in os.environ:
@@ -212,13 +222,17 @@
archiver = ar + ' ' + ar_flags
cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
compiler.set_executables(
preprocessor=cpp,
compiler=cc_cmd,
compiler_so=cc_cmd + ' ' + ccshared,
- compiler_cxx=cxx,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
linker_so=ldshared,
linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx,
archiver=archiver)
compiler.shared_lib_extension = so_ext
@@ -530,7 +544,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-arch\s+\w+\s', ' ', flags)
flags = re.sub('-isysroot [^ \t]*', ' ', flags)
@@ -549,7 +563,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-arch\s+\w+\s', ' ', flags)
@@ -573,7 +587,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
--- lib-python/2.7/distutils/sysconfig_pypy.py
+++ lib-python/2.7/distutils/sysconfig_pypy.py
@@ -114,13 +114,56 @@
optional C speedup components.
"""
if compiler.compiler_type == "unix":
- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
+ cc = ' '.join(compiler.compiler)
+ cxx = ' '.join(compiler.compiler_cxx)
+ ldshared = ' '.join(compiler.linker_so)
+ ldcxxshared = ' '.join(compiler.linker_so_cxx)
+
+ cflags = ''
+ cxxflags = ''
+ ccshared = '-fPIC'
+
+ if 'CC' in os.environ:
+ cc = os.environ['CC']
+ if 'CXX' in os.environ:
+ cxx = os.environ['CXX']
+ if 'LDSHARED' in os.environ:
+ ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
+ if 'CPP' in os.environ:
+ cpp = os.environ['CPP']
+ else:
+ cpp = cc + " -E" # not always
+ if 'LDFLAGS' in os.environ:
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+ if 'CFLAGS' in os.environ:
+ cflags = os.environ['CFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+ if 'CPPFLAGS' in os.environ:
+ cpp = cpp + ' ' + os.environ['CPPFLAGS']
+ cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+
+ cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
+ compiler.set_executables(
+ preprocessor=cpp,
+ compiler=cc_cmd,
+ compiler_so=cc_cmd + ' ' + ccshared,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+ linker_so=ldshared,
+ linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx)
compiler.shared_lib_extension = get_config_var('SO')
- if "CFLAGS" in os.environ:
- cflags = os.environ["CFLAGS"]
- compiler.compiler.append(cflags)
- compiler.compiler_so.append(cflags)
- compiler.linker_so.append(cflags)
from sysconfig_cpython import (
--- lib-python/2.7/distutils/unixccompiler.py
+++ lib-python/2.7/distutils/unixccompiler.py
@@ -114,14 +114,17 @@
# are pretty generic; they will probably have to be set by an outsider
# (eg. using information discovered by the sysconfig about building
# Python extensions).
- executables = {'preprocessor' : None,
- 'compiler' : ["cc"],
- 'compiler_so' : ["cc"],
- 'compiler_cxx' : ["cc"],
- 'linker_so' : ["cc", "-shared"],
- 'linker_exe' : ["cc"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : None,
+ executables = {'preprocessor' : None,
+ 'compiler' : ["cc"],
+ 'compiler_so' : ["cc"],
+ 'compiler_cxx' : ["c++"],
+ 'compiler_so_cxx' : ["c++"],
+ 'linker_so' : ["cc", "-shared"],
+ 'linker_exe' : ["cc"],
+ 'linker_so_cxx' : ["c++", "-shared"],
+ 'linker_exe_cxx' : ["c++"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : None,
}
if sys.platform[:6] == "darwin":
@@ -171,11 +174,18 @@
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
compiler_so = self.compiler_so
+ compiler_so_cxx = self.compiler_so_cxx
if sys.platform == 'darwin':
compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
+ compiler_so_cxx = _darwin_compiler_fixup(compiler_so_cxx, cc_args +
+ extra_postargs)
try:
- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
@@ -232,23 +242,16 @@
ld_args.extend(extra_postargs)
self.mkpath(os.path.dirname(output_filename))
try:
- if target_desc == CCompiler.EXECUTABLE:
- linker = self.linker_exe[:]
+ if target_lang == "c++":
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe_cxx[:]
+ else:
+ linker = self.linker_so_cxx[:]
else:
- linker = self.linker_so[:]
- if target_lang == "c++" and self.compiler_cxx:
- # skip over environment variable settings if /usr/bin/env
- # is used to set up the linker's environment.
- # This is needed on OSX. Note: this assumes that the
- # normal and C++ compiler have the same environment
- # settings.
- i = 0
- if os.path.basename(linker[0]) == "env":
- i = 1
- while '=' in linker[i]:
- i = i + 1
-
- linker[i] = self.compiler_cxx[i]
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe[:]
+ else:
+ linker = self.linker_so[:]
if sys.platform == 'darwin':
linker = _darwin_compiler_fixup(linker, ld_args)

@ -1,317 +0,0 @@
http://bugs.python.org/issue1222585
--- lib-python/2.7/distutils/cygwinccompiler.py
+++ lib-python/2.7/distutils/cygwinccompiler.py
@@ -135,9 +135,13 @@
self.set_executables(compiler='gcc -mcygwin -O -Wall',
compiler_so='gcc -mcygwin -mdll -O -Wall',
compiler_cxx='g++ -mcygwin -O -Wall',
+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
linker_exe='gcc -mcygwin',
linker_so=('%s -mcygwin %s' %
- (self.linker_dll, shared_option)))
+ (self.linker_dll, shared_option)),
+ linker_exe_cxx='g++ -mcygwin',
+ linker_so_cxx=('%s -mcygwin %s' %
+ (self.linker_dll, shared_option)))
# cygwin and mingw32 need different sets of libraries
if self.gcc_version == "2.91.57":
@@ -163,8 +167,12 @@
raise CompileError, msg
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
@@ -325,10 +338,15 @@
self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
compiler_so='gcc -mno-cygwin -mdll -O -Wall',
compiler_cxx='g++ -mno-cygwin -O -Wall',
+ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
linker_exe='gcc -mno-cygwin',
linker_so='%s -mno-cygwin %s %s'
% (self.linker_dll, shared_option,
- entry_point))
+ entry_point),
+ linker_exe_cxx='g++ -mno-cygwin',
+ linker_so_cxx='%s -mno-cygwin %s %s'
+ % (self.linker_dll, shared_option,
+ entry_point))
# Maybe we should also append -mthreads, but then the finished
# dlls need another dll (mingwm10.dll see Mingw32 docs)
# (-mthreads: Support thread-safe exception handling on `Mingw32')
--- lib-python/2.7/distutils/emxccompiler.py
+++ lib-python/2.7/distutils/emxccompiler.py
@@ -65,8 +65,12 @@
# XXX optimization, warnings etc. should be customizable.
self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
linker_exe='gcc -Zomf -Zmt -Zcrtdll',
- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
# want the gcc library statically linked (so that we don't have
# to distribute a version dependent on the compiler we have)
@@ -83,8 +87,12 @@
raise CompileError, msg
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
--- lib-python/2.7/distutils/sysconfig_cpython.py
+++ lib-python/2.7/distutils/sysconfig_cpython.py
@@ -149,10 +149,12 @@
varies across Unices and is stored in Python's Makefile.
"""
if compiler.compiler_type == "unix":
- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS')
+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
+ 'SO', 'AR', 'ARFLAGS')
+
+ cflags = ''
+ cxxflags = ''
newcc = None
if 'CC' in os.environ:
@@ -190,19 +192,27 @@
cxx = os.environ['CXX']
if 'LDSHARED' in os.environ:
ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
if 'CPP' in os.environ:
cpp = os.environ['CPP']
else:
cpp = cc + " -E" # not always
if 'LDFLAGS' in os.environ:
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ:
- cflags = opt + ' ' + os.environ['CFLAGS']
+ cflags = os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
if 'CPPFLAGS' in os.environ:
cpp = cpp + ' ' + os.environ['CPPFLAGS']
cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
if 'AR' in os.environ:
ar = os.environ['AR']
if 'ARFLAGS' in os.environ:
@@ -211,13 +221,17 @@
archiver = ar + ' ' + ar_flags
cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
compiler.set_executables(
preprocessor=cpp,
compiler=cc_cmd,
compiler_so=cc_cmd + ' ' + ccshared,
- compiler_cxx=cxx,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
linker_so=ldshared,
linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx,
archiver=archiver)
compiler.shared_lib_extension = so_ext
@@ -529,7 +543,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-arch\s+\w+\s', ' ', flags)
flags = re.sub('-isysroot [^ \t]*', ' ', flags)
@@ -548,7 +562,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-arch\s+\w+\s', ' ', flags)
@@ -572,7 +586,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
--- lib-python/2.7/distutils/sysconfig_pypy.py
+++ lib-python/2.7/distutils/sysconfig_pypy.py
@@ -123,7 +123,55 @@
optional C speedup components.
"""
if compiler.compiler_type == "unix":
- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
+ cc = ' '.join(compiler.compiler)
+ cxx = ' '.join(compiler.compiler_cxx)
+ ldshared = ' '.join(compiler.linker_so)
+ ldcxxshared = ' '.join(compiler.linker_so_cxx)
+
+ cflags = ''
+ cxxflags = ''
+ ccshared = '-fPIC'
+
+ if 'CC' in os.environ:
+ cc = os.environ['CC']
+ if 'CXX' in os.environ:
+ cxx = os.environ['CXX']
+ if 'LDSHARED' in os.environ:
+ ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
+ if 'CPP' in os.environ:
+ cpp = os.environ['CPP']
+ else:
+ cpp = cc + " -E" # not always
+ if 'LDFLAGS' in os.environ:
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+ if 'CFLAGS' in os.environ:
+ cflags = os.environ['CFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+ if 'CPPFLAGS' in os.environ:
+ cpp = cpp + ' ' + os.environ['CPPFLAGS']
+ cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+
+ cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
+ compiler.set_executables(
+ preprocessor=cpp,
+ compiler=cc_cmd,
+ compiler_so=cc_cmd + ' ' + ccshared,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+ linker_so=ldshared,
+ linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx)
compiler.shared_lib_extension = get_config_var('SO')
if "CPPFLAGS" in os.environ:
cppflags = shlex.split(os.environ["CPPFLAGS"])
--- lib-python/2.7/distutils/unixccompiler.py
+++ lib-python/2.7/distutils/unixccompiler.py
@@ -114,14 +114,17 @@
# are pretty generic; they will probably have to be set by an outsider
# (eg. using information discovered by the sysconfig about building
# Python extensions).
- executables = {'preprocessor' : None,
- 'compiler' : ["cc"],
- 'compiler_so' : ["cc"],
- 'compiler_cxx' : ["cc"],
- 'linker_so' : ["cc", "-shared"],
- 'linker_exe' : ["cc"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : None,
+ executables = {'preprocessor' : None,
+ 'compiler' : ["cc"],
+ 'compiler_so' : ["cc"],
+ 'compiler_cxx' : ["c++"],
+ 'compiler_so_cxx' : ["c++"],
+ 'linker_so' : ["cc", "-shared"],
+ 'linker_exe' : ["cc"],
+ 'linker_so_cxx' : ["c++", "-shared"],
+ 'linker_exe_cxx' : ["c++"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : None,
}
if sys.platform[:6] == "darwin":
@@ -171,11 +174,18 @@
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
compiler_so = self.compiler_so
+ compiler_so_cxx = self.compiler_so_cxx
if sys.platform == 'darwin':
compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
+ compiler_so_cxx = _darwin_compiler_fixup(compiler_so_cxx, cc_args +
+ extra_postargs)
try:
- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
@@ -232,23 +242,16 @@
ld_args.extend(extra_postargs)
self.mkpath(os.path.dirname(output_filename))
try:
- if target_desc == CCompiler.EXECUTABLE:
- linker = self.linker_exe[:]
+ if target_lang == "c++":
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe_cxx[:]
+ else:
+ linker = self.linker_so_cxx[:]
else:
- linker = self.linker_so[:]
- if target_lang == "c++" and self.compiler_cxx:
- # skip over environment variable settings if /usr/bin/env
- # is used to set up the linker's environment.
- # This is needed on OSX. Note: this assumes that the
- # normal and C++ compiler have the same environment
- # settings.
- i = 0
- if os.path.basename(linker[0]) == "env":
- i = 1
- while '=' in linker[i]:
- i = i + 1
-
- linker[i] = self.compiler_cxx[i]
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe[:]
+ else:
+ linker = self.linker_so[:]
if sys.platform == 'darwin':
linker = _darwin_compiler_fixup(linker, ld_args)

@ -1,149 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.0.2-r1.ebuild,v 1.5 2014/07/06 13:18:56 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
inherit eutils multilib pax-utils python-any-r1 versionator
BINHOST="http://dev.gentoo.org/~mgorny/dist/${PN}"
DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
HOMEPAGE="http://pypy.org/"
SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
amd64? (
jit? ( shadowstack? (
${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
) )
jit? ( !shadowstack? (
${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
) )
!jit? ( !shadowstack? (
${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
) )
)
x86? (
sse2? (
jit? ( shadowstack? (
${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
) )
jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
) )
!jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
) )
)
!sse2? (
!jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
) )
)
)"
# Supported variants
REQUIRED_USE="!jit? ( !shadowstack )
x86? ( !sse2? ( !jit !shadowstack ) )"
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
KEYWORDS="~amd64 ~x86"
IUSE="doc +jit shadowstack sqlite sse2 test"
# yep, world would be easier if people started filling subslots...
RDEPEND="
~app-arch/bzip2-1.0.6:0
~dev-libs/expat-2.1.0:0
( <dev-libs/libffi-3.0.14:0
>=dev-libs/libffi-3.0.11:0 )
( <dev-libs/openssl-1.0.1h:0
>=dev-libs/openssl-1.0.1c:0 )
( <sys-libs/glibc-2.20:2.2
>=sys-libs/glibc-2.15:2.2 )
~sys-libs/ncurses-5.9:5
( <sys-libs/zlib-1.2.9:0
>=sys-libs/zlib-1.2.7:0 )
sqlite? ( dev-db/sqlite:3 )
!dev-python/pypy:0"
DEPEND="app-arch/xz-utils
doc? ( dev-python/sphinx )
test? ( ${RDEPEND} )"
PDEPEND="app-admin/python-updater"
S=${WORKDIR}/pypy-${PV}-src
pkg_setup() {
use doc && python-any-r1_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}/1.9-scripts-location.patch"
epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
epatch "${FILESDIR}/2.0.2-distutils-fix_handling_of_executables_and_flags.patch"
epatch_user
}
src_compile() {
# Tadaam! PyPy compiled!
mv "${WORKDIR}"/${P}*/pypy-c . || die
mv "${WORKDIR}"/${P}*/include/*.h include/ || die
mv pypy/module/cpyext/include/*.h include/ || die
use doc && emake -C pypy/doc/ html
#needed even without jit :( also needed in both compile and install phases
pax-mark m pypy-c
}
src_test() {
# (unset)
local -x PYTHONDONTWRITEBYTECODE
./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
}
src_install() {
einfo "Installing PyPy ..."
insinto "/usr/$(get_libdir)/pypy"
doins -r include lib_pypy lib-python pypy-c
fperms a+x ${INSDESTTREE}/pypy-c
#needed even without jit :(
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dodoc README.rst
if ! use sqlite; then
rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 || die
rm "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py || die
fi
# Install docs
use doc && dohtml -r pypy/doc/_build/html/
einfo "Generating caches and byte-compiling ..."
python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
# Note: call portage helpers before this line.
# PYTHONPATH confuses them and will result in random failures.
local -x PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7"
# Generate Grammar and PatternGrammar pickles.
"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
|| die "Generation of Grammar and PatternGrammar pickles failed"
# Generate cffi cache
"${PYTHON}" -c "import _curses" || die "Failed to import _curses"
if use sqlite; then
"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3"
fi
# compile the installed modules
python_optimize "${ED%/}${INSDESTTREE}"
}

@ -1,66 +1,54 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.5 2014/11/05 21:18:12 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.7 2014/11/09 08:33:11 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
inherit eutils multilib pax-utils python-any-r1 vcs-snapshot versionator
PYTHON_COMPAT=( python2_7 pypy )
inherit eutils multilib pax-utils python-any-r1 versionator
BINHOST="http://packages.gentooexperimental.org/pypy/"
# x86 currently fails, so no pypy-bin yet
BINHOST="http://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
HOMEPAGE="http://pypy.org/"
SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
amd64? (
jit? ( shadowstack? (
${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
-> ${P}-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
) )
jit? ( !shadowstack? (
${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
-> ${P}-r1-amd64+bzip2+jit+ncurses.tar.xz
) )
!jit? ( !shadowstack? (
${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
-> ${P}-r1-amd64+bzip2+ncurses.tar.xz
) )
)
x86? (
sse2? (
jit? ( shadowstack? (
${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
) )
jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
) )
!jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
) )
)
!sse2? (
!jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
) )
)
)"
# x86? (
# sse2? (
# jit? ( shadowstack? (
# ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
# -> ${P}-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
# ) )
# jit? ( !shadowstack? (
# ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
# -> ${P}-r1-x86+bzip2+jit+ncurses+sse2.tar.xz
# ) )
# !jit? ( !shadowstack? (
# ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
# -> ${P}-r1-x86+bzip2+ncurses+sse2.tar.xz
# ) )
# )
# !sse2? (
# !jit? ( !shadowstack? (
# ${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
# -> ${P}-r1-x86+bzip2+ncurses.tar.xz
# ) )
# )
# )"
# Supported variants
REQUIRED_USE="!jit? ( !shadowstack )
x86? ( !sse2? ( !jit !shadowstack ) )"
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
#KEYWORDS="~amd64"
# Needs some more sanity checks before it gets unleashed on users
KEYWORDS=""
KEYWORDS="~amd64 ~x86"
IUSE="doc gdbm +jit shadowstack sqlite sse2 test tk"
# yep, world would be easier if people started filling subslots...
@ -92,8 +80,8 @@ pkg_setup() {
}
src_prepare() {
epatch "${FILESDIR}/1.9-scripts-location.patch"
epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
epatch "${FILESDIR}/1.9-scripts-location.patch" \
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
pushd lib-python/2.7 > /dev/null || die
epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch"
@ -112,15 +100,20 @@ src_compile() {
use doc && emake -C pypy/doc/ html
#needed even without jit :( also needed in both compile and install phases
pax-mark m pypy-c
# ctypes config cache
# this one we need to do with python2 too...
./pypy-c lib_pypy/ctypes_config_cache/rebuild.py \
|| die "Failed to rebuild ctypes config cache"
}
# Doesn't work - pypy missing its own libs
#src_test() {
# # (unset)
# local -x PYTHONDONTWRITEBYTECODE
#
# ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
#}
src_test() {
# (unset)
local -x PYTHONDONTWRITEBYTECODE
./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
}
src_install() {
einfo "Installing PyPy ..."
@ -129,7 +122,6 @@ src_install() {
fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
dodoc README.rst
if ! use gdbm; then
@ -163,9 +155,6 @@ src_install() {
"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
|| die "Generation of Grammar and PatternGrammar pickles failed"
# ctypes config cache
"${PYTHON}" -m ctypes_config_cache.rebuild || die "Failed to rebuild ctypes config cache"
# Generate cffi cache
# Please keep in sync with pypy/tool/release/package.py!
"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"

@ -1,4 +1,2 @@
DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
DIST pypy-2.2.1-src.tar.bz2 14439822 SHA256 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f SHA512 68b52c5b1a9b96593aa1dd38ad0b1b7b282852008e3ae3c488a5e19ab2bede68e2b40afdb79d85a4ab21cb1da6647b8b958fcefe34c99a1f6cbc1a19d695d3b6 WHIRLPOOL 6eca63959d8ee5663f868daaaac32ad1180b07e2f8b63d839652902095a098ffbfa29c6f83451733270a4b2f73b65450cb3b80a878b9dd1ec71089bfff11e9f6
DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b

@ -1,323 +0,0 @@
http://bugs.python.org/issue1222585
--- a/lib-python/2.7/distutils/cygwinccompiler.py
+++ b/lib-python/2.7/distutils/cygwinccompiler.py
@@ -132,9 +132,13 @@
self.set_executables(compiler='gcc -mcygwin -O -Wall',
compiler_so='gcc -mcygwin -mdll -O -Wall',
compiler_cxx='g++ -mcygwin -O -Wall',
+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
linker_exe='gcc -mcygwin',
linker_so=('%s -mcygwin %s' %
- (self.linker_dll, shared_option)))
+ (self.linker_dll, shared_option)),
+ linker_exe_cxx='g++ -mcygwin',
+ linker_so_cxx=('%s -mcygwin %s' %
+ (self.linker_dll, shared_option)))
# cygwin and mingw32 need different sets of libraries
if self.gcc_version == "2.91.57":
@@ -160,8 +164,12 @@
raise CompileError, msg
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
@@ -322,10 +330,15 @@
self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
compiler_so='gcc -mno-cygwin -mdll -O -Wall',
compiler_cxx='g++ -mno-cygwin -O -Wall',
+ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
linker_exe='gcc -mno-cygwin',
linker_so='%s -mno-cygwin %s %s'
% (self.linker_dll, shared_option,
- entry_point))
+ entry_point),
+ linker_exe_cxx='g++ -mno-cygwin',
+ linker_so_cxx='%s -mno-cygwin %s %s'
+ % (self.linker_dll, shared_option,
+ entry_point))
# Maybe we should also append -mthreads, but then the finished
# dlls need another dll (mingwm10.dll see Mingw32 docs)
# (-mthreads: Support thread-safe exception handling on `Mingw32')
--- a/lib-python/2.7/distutils/emxccompiler.py
+++ b/lib-python/2.7/distutils/emxccompiler.py
@@ -65,8 +65,12 @@
# XXX optimization, warnings etc. should be customizable.
self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
linker_exe='gcc -Zomf -Zmt -Zcrtdll',
- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
# want the gcc library statically linked (so that we don't have
# to distribute a version dependent on the compiler we have)
@@ -83,8 +87,12 @@
raise CompileError, msg
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
--- a/lib-python/2.7/distutils/sysconfig_cpython.py
+++ b/lib-python/2.7/distutils/sysconfig_cpython.py
@@ -150,10 +150,12 @@
varies across Unices and is stored in Python's Makefile.
"""
if compiler.compiler_type == "unix":
- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS')
+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
+ 'SO', 'AR', 'ARFLAGS')
+
+ cflags = ''
+ cxxflags = ''
newcc = None
if 'CC' in os.environ:
@@ -191,19 +193,27 @@
cxx = os.environ['CXX']
if 'LDSHARED' in os.environ:
ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
if 'CPP' in os.environ:
cpp = os.environ['CPP']
else:
cpp = cc + " -E" # not always
if 'LDFLAGS' in os.environ:
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ:
- cflags = opt + ' ' + os.environ['CFLAGS']
+ cflags = os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
if 'CPPFLAGS' in os.environ:
cpp = cpp + ' ' + os.environ['CPPFLAGS']
cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
if 'AR' in os.environ:
ar = os.environ['AR']
if 'ARFLAGS' in os.environ:
@@ -212,13 +222,17 @@
archiver = ar + ' ' + ar_flags
cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
compiler.set_executables(
preprocessor=cpp,
compiler=cc_cmd,
compiler_so=cc_cmd + ' ' + ccshared,
- compiler_cxx=cxx,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
linker_so=ldshared,
linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx,
archiver=archiver)
compiler.shared_lib_extension = so_ext
@@ -530,7 +544,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-arch\s+\w+\s', ' ', flags)
flags = re.sub('-isysroot [^ \t]*', ' ', flags)
@@ -549,7 +563,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-arch\s+\w+\s', ' ', flags)
@@ -573,7 +587,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
--- a/lib-python/2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
@@ -114,13 +114,56 @@
optional C speedup components.
"""
if compiler.compiler_type == "unix":
- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
+ cc = ' '.join(compiler.compiler)
+ cxx = ' '.join(compiler.compiler_cxx)
+ ldshared = ' '.join(compiler.linker_so)
+ ldcxxshared = ' '.join(compiler.linker_so_cxx)
+
+ cflags = ''
+ cxxflags = ''
+ ccshared = '-fPIC'
+
+ if 'CC' in os.environ:
+ cc = os.environ['CC']
+ if 'CXX' in os.environ:
+ cxx = os.environ['CXX']
+ if 'LDSHARED' in os.environ:
+ ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
+ if 'CPP' in os.environ:
+ cpp = os.environ['CPP']
+ else:
+ cpp = cc + " -E" # not always
+ if 'LDFLAGS' in os.environ:
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+ if 'CFLAGS' in os.environ:
+ cflags = os.environ['CFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+ if 'CPPFLAGS' in os.environ:
+ cpp = cpp + ' ' + os.environ['CPPFLAGS']
+ cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+
+ cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
+ compiler.set_executables(
+ preprocessor=cpp,
+ compiler=cc_cmd,
+ compiler_so=cc_cmd + ' ' + ccshared,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+ linker_so=ldshared,
+ linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx)
compiler.shared_lib_extension = get_config_var('SO')
- if "CFLAGS" in os.environ:
- cflags = os.environ["CFLAGS"]
- compiler.compiler.append(cflags)
- compiler.compiler_so.append(cflags)
- compiler.linker_so.append(cflags)
from sysconfig_cpython import (
--- a/lib-python/2.7/distutils/unixccompiler.py
+++ b/lib-python/2.7/distutils/unixccompiler.py
@@ -114,14 +114,17 @@
# are pretty generic; they will probably have to be set by an outsider
# (eg. using information discovered by the sysconfig about building
# Python extensions).
- executables = {'preprocessor' : None,
- 'compiler' : ["cc"],
- 'compiler_so' : ["cc"],
- 'compiler_cxx' : ["cc"],
- 'linker_so' : ["cc", "-shared"],
- 'linker_exe' : ["cc"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : None,
+ executables = {'preprocessor' : None,
+ 'compiler' : ["cc"],
+ 'compiler_so' : ["cc"],
+ 'compiler_cxx' : ["c++"],
+ 'compiler_so_cxx' : ["c++"],
+ 'linker_so' : ["cc", "-shared"],
+ 'linker_exe' : ["cc"],
+ 'linker_so_cxx' : ["c++", "-shared"],
+ 'linker_exe_cxx' : ["c++"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : None,
}
if sys.platform[:6] == "darwin":
@@ -171,11 +174,18 @@
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
compiler_so = self.compiler_so
+ compiler_so_cxx = self.compiler_so_cxx
if sys.platform == 'darwin':
compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
+ compiler_so_cxx = _darwin_compiler_fixup(compiler_so_cxx, cc_args +
+ extra_postargs)
try:
- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
@@ -232,23 +242,16 @@
ld_args.extend(extra_postargs)
self.mkpath(os.path.dirname(output_filename))
try:
- if target_desc == CCompiler.EXECUTABLE:
- linker = self.linker_exe[:]
+ if target_lang == "c++":
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe_cxx[:]
+ else:
+ linker = self.linker_so_cxx[:]
else:
- linker = self.linker_so[:]
- if target_lang == "c++" and self.compiler_cxx:
- # skip over environment variable settings if /usr/bin/env
- # is used to set up the linker's environment.
- # This is needed on OSX. Note: this assumes that the
- # normal and C++ compiler have the same environment
- # settings.
- i = 0
- if os.path.basename(linker[0]) == "env":
- i = 1
- while '=' in linker[i]:
- i = i + 1
-
- linker[i] = self.compiler_cxx[i]
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe[:]
+ else:
+ linker = self.linker_so[:]
if sys.platform == 'darwin':
linker = _darwin_compiler_fixup(linker, ld_args)

@ -1,317 +0,0 @@
http://bugs.python.org/issue1222585
--- a/lib-python/2.7/distutils/cygwinccompiler.py
+++ b/lib-python/2.7/distutils/cygwinccompiler.py
@@ -135,9 +135,13 @@
self.set_executables(compiler='gcc -mcygwin -O -Wall',
compiler_so='gcc -mcygwin -mdll -O -Wall',
compiler_cxx='g++ -mcygwin -O -Wall',
+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
linker_exe='gcc -mcygwin',
linker_so=('%s -mcygwin %s' %
- (self.linker_dll, shared_option)))
+ (self.linker_dll, shared_option)),
+ linker_exe_cxx='g++ -mcygwin',
+ linker_so_cxx=('%s -mcygwin %s' %
+ (self.linker_dll, shared_option)))
# cygwin and mingw32 need different sets of libraries
if self.gcc_version == "2.91.57":
@@ -163,8 +167,12 @@
raise CompileError, msg
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
@@ -325,10 +338,15 @@
self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
compiler_so='gcc -mno-cygwin -mdll -O -Wall',
compiler_cxx='g++ -mno-cygwin -O -Wall',
+ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
linker_exe='gcc -mno-cygwin',
linker_so='%s -mno-cygwin %s %s'
% (self.linker_dll, shared_option,
- entry_point))
+ entry_point),
+ linker_exe_cxx='g++ -mno-cygwin',
+ linker_so_cxx='%s -mno-cygwin %s %s'
+ % (self.linker_dll, shared_option,
+ entry_point))
# Maybe we should also append -mthreads, but then the finished
# dlls need another dll (mingwm10.dll see Mingw32 docs)
# (-mthreads: Support thread-safe exception handling on `Mingw32')
--- a/lib-python/2.7/distutils/emxccompiler.py
+++ b/lib-python/2.7/distutils/emxccompiler.py
@@ -65,8 +65,12 @@
# XXX optimization, warnings etc. should be customizable.
self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
linker_exe='gcc -Zomf -Zmt -Zcrtdll',
- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
# want the gcc library statically linked (so that we don't have
# to distribute a version dependent on the compiler we have)
@@ -83,8 +87,12 @@
raise CompileError, msg
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
--- a/lib-python/2.7/distutils/sysconfig_cpython.py
+++ b/lib-python/2.7/distutils/sysconfig_cpython.py
@@ -149,10 +149,12 @@
varies across Unices and is stored in Python's Makefile.
"""
if compiler.compiler_type == "unix":
- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS')
+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
+ 'SO', 'AR', 'ARFLAGS')
+
+ cflags = ''
+ cxxflags = ''
newcc = None
if 'CC' in os.environ:
@@ -190,19 +192,27 @@
cxx = os.environ['CXX']
if 'LDSHARED' in os.environ:
ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
if 'CPP' in os.environ:
cpp = os.environ['CPP']
else:
cpp = cc + " -E" # not always
if 'LDFLAGS' in os.environ:
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ:
- cflags = opt + ' ' + os.environ['CFLAGS']
+ cflags = os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
if 'CPPFLAGS' in os.environ:
cpp = cpp + ' ' + os.environ['CPPFLAGS']
cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
if 'AR' in os.environ:
ar = os.environ['AR']
if 'ARFLAGS' in os.environ:
@@ -211,13 +221,17 @@
archiver = ar + ' ' + ar_flags
cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
compiler.set_executables(
preprocessor=cpp,
compiler=cc_cmd,
compiler_so=cc_cmd + ' ' + ccshared,
- compiler_cxx=cxx,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
linker_so=ldshared,
linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx,
archiver=archiver)
compiler.shared_lib_extension = so_ext
@@ -529,7 +543,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-arch\s+\w+\s', ' ', flags)
flags = re.sub('-isysroot [^ \t]*', ' ', flags)
@@ -548,7 +562,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-arch\s+\w+\s', ' ', flags)
@@ -572,7 +586,7 @@
for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
# a number of derived variables. These need to be
# patched up as well.
- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
flags = _config_vars[key]
flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
--- a/lib-python/2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
@@ -123,7 +123,55 @@
optional C speedup components.
"""
if compiler.compiler_type == "unix":
- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
+ cc = ' '.join(compiler.compiler)
+ cxx = ' '.join(compiler.compiler_cxx)
+ ldshared = ' '.join(compiler.linker_so)
+ ldcxxshared = ' '.join(compiler.linker_so_cxx)
+
+ cflags = ''
+ cxxflags = ''
+ ccshared = '-fPIC'
+
+ if 'CC' in os.environ:
+ cc = os.environ['CC']
+ if 'CXX' in os.environ:
+ cxx = os.environ['CXX']
+ if 'LDSHARED' in os.environ:
+ ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
+ if 'CPP' in os.environ:
+ cpp = os.environ['CPP']
+ else:
+ cpp = cc + " -E" # not always
+ if 'LDFLAGS' in os.environ:
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+ if 'CFLAGS' in os.environ:
+ cflags = os.environ['CFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+ if 'CPPFLAGS' in os.environ:
+ cpp = cpp + ' ' + os.environ['CPPFLAGS']
+ cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+
+ cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
+ compiler.set_executables(
+ preprocessor=cpp,
+ compiler=cc_cmd,
+ compiler_so=cc_cmd + ' ' + ccshared,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+ linker_so=ldshared,
+ linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx)
compiler.shared_lib_extension = get_config_var('SO')
if "CPPFLAGS" in os.environ:
cppflags = shlex.split(os.environ["CPPFLAGS"])
--- a/lib-python/2.7/distutils/unixccompiler.py
+++ b/lib-python/2.7/distutils/unixccompiler.py
@@ -114,14 +114,17 @@
# are pretty generic; they will probably have to be set by an outsider
# (eg. using information discovered by the sysconfig about building
# Python extensions).
- executables = {'preprocessor' : None,
- 'compiler' : ["cc"],
- 'compiler_so' : ["cc"],
- 'compiler_cxx' : ["cc"],
- 'linker_so' : ["cc", "-shared"],
- 'linker_exe' : ["cc"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : None,
+ executables = {'preprocessor' : None,
+ 'compiler' : ["cc"],
+ 'compiler_so' : ["cc"],
+ 'compiler_cxx' : ["c++"],
+ 'compiler_so_cxx' : ["c++"],
+ 'linker_so' : ["cc", "-shared"],
+ 'linker_exe' : ["cc"],
+ 'linker_so_cxx' : ["c++", "-shared"],
+ 'linker_exe_cxx' : ["c++"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : None,
}
if sys.platform[:6] == "darwin":
@@ -171,11 +174,18 @@
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
compiler_so = self.compiler_so
+ compiler_so_cxx = self.compiler_so_cxx
if sys.platform == 'darwin':
compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
+ compiler_so_cxx = _darwin_compiler_fixup(compiler_so_cxx, cc_args +
+ extra_postargs)
try:
- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError, msg:
raise CompileError, msg
@@ -232,23 +242,16 @@
ld_args.extend(extra_postargs)
self.mkpath(os.path.dirname(output_filename))
try:
- if target_desc == CCompiler.EXECUTABLE:
- linker = self.linker_exe[:]
+ if target_lang == "c++":
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe_cxx[:]
+ else:
+ linker = self.linker_so_cxx[:]
else:
- linker = self.linker_so[:]
- if target_lang == "c++" and self.compiler_cxx:
- # skip over environment variable settings if /usr/bin/env
- # is used to set up the linker's environment.
- # This is needed on OSX. Note: this assumes that the
- # normal and C++ compiler have the same environment
- # settings.
- i = 0
- if os.path.basename(linker[0]) == "env":
- i = 1
- while '=' in linker[i]:
- i = i + 1
-
- linker[i] = self.compiler_cxx[i]
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe[:]
+ else:
+ linker = self.linker_so[:]
if sys.platform == 'darwin':
linker = _darwin_compiler_fixup(linker, ld_args)

@ -1,165 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0.2-r1.ebuild,v 1.4 2014/07/06 13:18:53 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
inherit check-reqs eutils multilib multiprocessing pax-utils \
python-any-r1 toolchain-funcs versionator
DESCRIPTION="A fast, compliant alternative implementation of the Python language"
HOMEPAGE="http://pypy.org/"
SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2"
RDEPEND=">=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
dev-libs/expat
dev-libs/openssl
bzip2? ( app-arch/bzip2 )
ncurses? ( sys-libs/ncurses )
sqlite? ( dev-db/sqlite:3 )
!dev-python/pypy-bin:0"
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx )
${PYTHON_DEPS}"
PDEPEND="app-admin/python-updater"
S="${WORKDIR}/${P}-src"
pkg_pretend() {
CHECKREQS_MEMORY="2G"
use amd64 && CHECKREQS_MEMORY="4G"
check-reqs_pkg_pretend
# if [[ ${MERGE_TYPE} != binary && "$(gcc-version)" == "4.8" ]]; then
# die "PyPy does not build correctly with GCC 4.8"
# fi
}
pkg_setup() {
pkg_pretend
python-any-r1_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}/1.9-scripts-location.patch"
epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
epatch "${FILESDIR}/2.0.2-distutils-fix_handling_of_executables_and_flags.patch"
epatch_user
}
src_compile() {
tc-export CC
local jit_backend
if use jit; then
jit_backend='--jit-backend='
# We only need the explicit sse2 switch for x86.
# On other arches we can rely on autodetection which uses
# compiler macros. Plus, --jit-backend= doesn't accept all
# the modern values...
if use x86; then
if use sse2; then
jit_backend+=x86
else
jit_backend+=x86-without-sse2
fi
else
jit_backend+=auto
fi
fi
local args=(
$(usex jit -Ojit -O2)
$(usex shadowstack --gcrootfinder=shadowstack '')
$(usex sandbox --sandbox '')
${jit_backend}
--make-jobs=$(makeopts_jobs)
pypy/goal/targetpypystandalone
)
# Avoid linking against libraries disabled by use flags
local opts=(
bzip2:bz2
ncurses:_minimal_curses
)
local opt
for opt in "${opts[@]}"; do
local flag=${opt%:*}
local mod=${opt#*:}
args+=(
$(usex ${flag} --withmod --withoutmod)-${mod}
)
done
set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
echo -e "\033[1m${@}\033[0m"
"${@}" || die "compile error"
use doc && emake -C pypy/doc/ html
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
}
src_test() {
# (unset)
local -x PYTHONDONTWRITEBYTECODE
./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
}
src_install() {
einfo "Installing PyPy ..."
insinto "/usr/$(get_libdir)/pypy"
doins -r include lib_pypy lib-python pypy-c
fperms a+x ${INSDESTTREE}/pypy-c
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dodoc README.rst
if ! use sqlite; then
rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 || die
rm "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py || die
fi
# Install docs
use doc && dohtml -r pypy/doc/_build/html/
einfo "Generating caches and byte-compiling ..."
python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
# Note: call portage helpers before this line.
# PYTHONPATH confuses them and will result in random failures.
local -x PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7"
# Generate Grammar and PatternGrammar pickles.
"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
|| die "Generation of Grammar and PatternGrammar pickles failed"
# Generate cffi cache
"${PYTHON}" -c "import _curses" || die "Failed to import _curses"
if use sqlite; then
"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3"
fi
# compile the installed modules
python_optimize "${ED%/}${INSDESTTREE}"
}

@ -1,176 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.2.1.ebuild,v 1.7 2014/07/06 13:18:53 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
inherit check-reqs eutils multilib multiprocessing pax-utils \
python-any-r1 toolchain-funcs versionator
DESCRIPTION="A fast, compliant alternative implementation of the Python language"
HOMEPAGE="http://pypy.org/"
SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2 tk"
RDEPEND=">=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
dev-libs/expat
dev-libs/openssl
bzip2? ( app-arch/bzip2 )
ncurses? ( sys-libs/ncurses )
sqlite? ( dev-db/sqlite:3 )
tk? (
dev-lang/tk:0
dev-tcltk/tix
)
!dev-python/pypy-bin:0"
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx )
${PYTHON_DEPS}"
PDEPEND="app-admin/python-updater"
S="${WORKDIR}/${P}-src"
pkg_pretend() {
CHECKREQS_MEMORY="2G"
use amd64 && CHECKREQS_MEMORY="4G"
check-reqs_pkg_pretend
}
pkg_setup() {
pkg_pretend
python-any-r1_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}/1.9-scripts-location.patch"
epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
epatch "${FILESDIR}/2.1-distutils-fix_handling_of_executables_and_flags.patch"
epatch_user
}
src_compile() {
tc-export CC
local jit_backend
if use jit; then
jit_backend='--jit-backend='
# We only need the explicit sse2 switch for x86.
# On other arches we can rely on autodetection which uses
# compiler macros. Plus, --jit-backend= doesn't accept all
# the modern values...
if use x86; then
if use sse2; then
jit_backend+=x86
else
jit_backend+=x86-without-sse2
fi
else
jit_backend+=auto
fi
fi
local args=(
$(usex jit -Ojit -O2)
$(usex shadowstack --gcrootfinder=shadowstack '')
$(usex sandbox --sandbox '')
${jit_backend}
--make-jobs=$(makeopts_jobs)
pypy/goal/targetpypystandalone
)
# Avoid linking against libraries disabled by use flags
local opts=(
bzip2:bz2
ncurses:_minimal_curses
)
local opt
for opt in "${opts[@]}"; do
local flag=${opt%:*}
local mod=${opt#*:}
args+=(
$(usex ${flag} --withmod --withoutmod)-${mod}
)
done
set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
echo -e "\033[1m${@}\033[0m"
"${@}" || die "compile error"
use doc && emake -C pypy/doc/ html
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
}
src_test() {
# (unset)
local -x PYTHONDONTWRITEBYTECODE
./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
}
src_install() {
einfo "Installing PyPy ..."
insinto "/usr/$(get_libdir)/pypy"
doins -r include lib_pypy lib-python pypy-c
fperms a+x ${INSDESTTREE}/pypy-c
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dodoc README.rst
if ! use sqlite; then
rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
fi
if ! use tk; then
rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
use doc && dohtml -r pypy/doc/_build/html/
einfo "Generating caches and byte-compiling ..."
python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
# Note: call portage helpers before this line.
# PYTHONPATH confuses them and will result in random failures.
local -x PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7"
# Generate Grammar and PatternGrammar pickles.
"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
|| die "Generation of Grammar and PatternGrammar pickles failed"
# Generate cffi cache
"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
if use sqlite; then
"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
fi
if use tk; then
"${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
fi
# compile the installed modules
python_optimize "${ED%/}${INSDESTTREE}"
}

@ -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/pypy/pypy-2.4.0.ebuild,v 1.8 2014/11/05 22:58:22 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v 1.9 2014/11/08 23:04:12 mgorny Exp $
EAPI=5
@ -14,11 +14,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
# Wait for pypy-bin to appear
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS=""
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite sse2 tk"
RDEPEND=">=sys-libs/zlib-1.1.3:0=

@ -0,0 +1,8 @@
DIST pypy3-2.4.0-src.tar.bz2 14693194 SHA256 d9ba207d6eecf8a0dc4414e9f4e92db1abd143e8cc6ec4a6bdcac75b29f104f3 SHA512 7e2b0c21f1833b8cd61251c2d58c6a9f99207e5d582618f0036886ff28dcb313541dce1c36bd1b57b332a36a94b13e416bb7b67110be7c8ece8283749ba712be WHIRLPOOL bd02009c828b7b491b46b260d687d268561e5372766adccbcb58e87a3f1c545f293c54e5cdd6e6b7fb95feb678677137211ee890f106140ce1bc256f8563d2cd
DIST pypy3-bin-2.4.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9687272 SHA256 8f03fc87ec796877e5a13111f509a5d1c06284bc31133d25c4c9cca6a82f7039 SHA512 ec5e3ef4f2f4b06c31df5ab9fc4a9f7a2a08f744a0128e6ab8215767d4fba7a3e35e319ff9d9a0de4d018ed35eed24809c82928972a860a220ea45f284087770 WHIRLPOOL 15ba1d18ae4fc5d0968fa5c6cadfcb8762b258d683c770530ac35067ca91210f8d825facd775602a9d2b578542a4b760a0a11a9b0a6d59f539d4e7043fcad734
DIST pypy3-bin-2.4.0-amd64+bzip2+jit+ncurses.tar.xz 11047984 SHA256 558176dacd1e3222fb56b8c3226077288281ee2a131149fdbb2a54561d5bc7d9 SHA512 cde76c37bf9c043a4fde4a2d07a04366f3c906562e6ed640544ac0228b511729b481c6cd6b7b25b80c02a69cdd02707d427edcd8e46e41313b31161313c6c5fb WHIRLPOOL 9eb8dc5d3319bf2c09baae38ecaa23c1f7ee38b4ea20f72a9fde3f68004ac4f3cbe807ff93e6cba5318745a251d09d2f951cb5a86f04c41b2e05d151d1f6cd03
DIST pypy3-bin-2.4.0-amd64+bzip2+ncurses.tar.xz 6281232 SHA256 326115bcd7ad2d659b69842182dee4fc2adb558f20a3e44ab4b803fa70c43a21 SHA512 f938aa797e352f80a99095a15bf83a758f0c203adc402cf92494f909ad870457a28ae14b5959880e55898c2ce92ce0b08b05e3d691133758bca52f524c8aad73 WHIRLPOOL b0aa4c24d645aa914aa439646b813dfcae14e6731af86d4348d24637bbdb7f88a26d3a63ff5262749ee654715eaf5312beb4879341d222aaedfcd3e81acd2426
DIST pypy3-bin-2.4.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 8159232 SHA256 65bb567693048894d13c7ffecda126a222ebb641dc6c6e0a899197da8f0844d8 SHA512 734e42d6962b4411d9beab55013454dd27bd18c342ed334e07f85e217cd7d992cbaffb36ee3e74469662860f130d1065a381e49a6b8287fa83736ffe75cb8a5a WHIRLPOOL a5b7ed4a177dc5c1322e79551166d3be8e478e969b223db4fe6a2e9fddaf2e4c22633726a667e3deca19763f44edd4e3f4c20c477da5d7e26c88f21d4ce70544
DIST pypy3-bin-2.4.0-x86+bzip2+jit+ncurses+sse2.tar.xz 9121216 SHA256 5f03284815a313065b99da0154a08831e3ae2c6e43c4ce515de1aff60c4537ad SHA512 f069ece90666385eb8aade97ad81c4c6c2480dee1bf3b1cb520c4fc1d123d17f7ef2cbf7ed25b72b24e56165c08ded671c8bce74ed2ea2f1b6e57ca9fdd214ae WHIRLPOOL 8cf368e0efa416d3cba06ea61bc97ed7ead0e25f5008c948d1bec8d0494fd9908d1e6640414ffe7c6b6260badef41da114370f2a5ef28a63234203a604e1be4e
DIST pypy3-bin-2.4.0-x86+bzip2+ncurses+sse2.tar.xz 5366816 SHA256 bff57d563dbce1b4858d87161c2338e5ed6ed20008a8dc4fb78cbb9e320d1188 SHA512 afb395257b0259b096a9fdbae405ffb021950dfda39ddc490777662ab77d0573b5b51e6381241c09debbca0a706637dba39c8644c878e541b83d68a94fc9ad1e WHIRLPOOL a1e1079a68b03b65a0680c65080d6c6dc48e4a652dd634bfaa805a6117c67da84bcc65ee2fe6711a61ab86a905bd2a6993e0ac88547a807eca3722f70ca890fb
DIST pypy3-bin-2.4.0-x86+bzip2+ncurses.tar.xz 5439032 SHA256 3bd4e476ff76da1f3c111a11abe0ef72683ba719934ede1252c32de6200beb25 SHA512 d11805b704baa51097261f0886bd160f9d1a3e220ceeeaa5741c3aaf9ee8437479b2f371889dbe2ad72f16559de86c1e71bfd17f45375071cafc535d7c30b3cc WHIRLPOOL 41ef35df997da9aca90be8442001b6807c1a8dd0a7d4e66c0c925dc74546db35e6d54a2bf292c8bca732427786019e7e5041d19e6169e2573a058f269a0332ce

@ -0,0 +1,11 @@
--- a/lib-python/3/distutils/unixccompiler.py
+++ b/lib-python/3/distutils/unixccompiler.py
@@ -297,7 +297,7 @@
# this time, there's no way to determine this information from
# the configuration data stored in the Python installation, so
# we use this hack.
- compiler = os.path.basename(sysconfig.get_config_var("CC"))
+ compiler = os.path.basename(self.compiler[0])
if sys.platform[:6] == "darwin":
# MacOSX's linker doesn't understand the -R flag at all
return "-L" + dir

@ -0,0 +1,11 @@
--- a/lib-python/3/distutils/command/install.py
+++ b/lib-python/3/distutils/command/install.py
@@ -87,7 +87,7 @@
'purelib': '$base/site-packages',
'platlib': '$base/site-packages',
'headers': '$base/include',
- 'scripts': '$base/bin',
+ 'scripts': '/usr/bin',
'data' : '$base',
},
}

@ -0,0 +1,11 @@
--- rpython/translator/platform/posix.py
+++ rpython/translator/platform/posix.py
@@ -180,7 +180,7 @@
'int main(int argc, char* argv[]) '
'{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
- '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@')
+ '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
return m

@ -0,0 +1,16 @@
<?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>alice.ferrazzi@gmail.com</email>
<name>Alice Ferrazzi</name>
<description>Proxy maintainer</description>
</maintainer>
<use>
<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.</flag>
<flag name="sandbox">Enable sandboxing functionality</flag>
<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
</use>
</pkgmetadata>

@ -1,50 +1,44 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.2.1-r1.ebuild,v 1.4 2014/07/06 13:18:56 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy3-bin/pypy3-bin-2.4.0.ebuild,v 1.1 2014/11/09 08:29:03 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
# some random parts need python 2...
PYTHON_COMPAT=( python2_7 pypy )
inherit eutils multilib pax-utils python-any-r1 versionator
BINHOST="http://pypy.aliceinwire.net/pypy-bin/"
BINHOST="http://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
DESCRIPTION="A fast, compliant alternative implementation of Python 3 (binary package)"
HOMEPAGE="http://pypy.org/"
SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy3-${PV}-src.tar.bz2
amd64? (
jit? ( shadowstack? (
${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
-> ${P}-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
) )
jit? ( !shadowstack? (
${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
-> ${P}-r1-amd64+bzip2+jit+ncurses.tar.xz
) )
!jit? ( !shadowstack? (
${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
-> ${P}-r1-amd64+bzip2+ncurses.tar.xz
) )
)
x86? (
sse2? (
jit? ( shadowstack? (
${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
-> ${P}-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
) )
jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
-> ${P}-r1-x86+bzip2+jit+ncurses+sse2.tar.xz
) )
!jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
-> ${P}-r1-x86+bzip2+ncurses+sse2.tar.xz
) )
)
!sse2? (
!jit? ( !shadowstack? (
${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
-> ${P}-r1-x86+bzip2+ncurses.tar.xz
) )
)
)"
@ -56,7 +50,7 @@ REQUIRED_USE="!jit? ( !shadowstack )
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
KEYWORDS="~amd64 ~x86"
IUSE="doc +jit shadowstack sqlite sse2 test tk"
IUSE="gdbm +jit shadowstack sqlite sse2 test tk"
# yep, world would be easier if people started filling subslots...
RDEPEND="
@ -67,90 +61,102 @@ RDEPEND="
sys-libs/glibc:2.2
sys-libs/ncurses:5
sys-libs/zlib:0
sqlite? ( dev-db/sqlite:3 )
tk? ( dev-lang/tk:0 )
gdbm? ( sys-libs/gdbm:0= )
sqlite? ( dev-db/sqlite:3= )
tk? (
dev-lang/tk:0=
dev-tcltk/tix:0=
)
!dev-python/pypy:0"
DEPEND="app-arch/xz-utils
doc? ( dev-python/sphinx )
test? ( ${RDEPEND} )"
test? ( ${RDEPEND}
${PYTHON_DEPS} )"
# doc? ( ${PYTHON_DEPS}
# dev-python/sphinx )
PDEPEND="app-admin/python-updater"
S=${WORKDIR}/pypy-${PV}-src
pkg_setup() {
use doc && python-any-r1_pkg_setup
}
S=${WORKDIR}/pypy3-${PV}-src
src_prepare() {
epatch "${FILESDIR}/1.9-scripts-location.patch"
epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
epatch "${FILESDIR}/2.1-distutils-fix_handling_of_executables_and_flags.patch"
epatch "${FILESDIR}/1.9-scripts-location.patch" \
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
epatch_user
}
src_compile() {
# Tadaam! PyPy compiled!
mv "${WORKDIR}"/${P}*/pypy-c . || die
mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
mv "${WORKDIR}"/${P}*/include/*.h include/ || die
mv pypy/module/cpyext/include/*.h include/ || die
mv pypy/module/cpyext/include/numpy include/ || die
use doc && emake -C pypy/doc/ html
#use doc && emake -C pypy/doc/ html
#needed even without jit :( also needed in both compile and install phases
pax-mark m pypy-c
# ctypes config cache
# this one we need to do with python2 too...
"${PYTHON}" lib_pypy/ctypes_config_cache/rebuild.py \
|| die "Failed to rebuild ctypes config cache"
}
src_test() {
# (unset)
local -x PYTHONDONTWRITEBYTECODE
./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
# Test runner requires Python 2 too. However, it spawns PyPy3
# internally so that we end up testing the correct interpreter.
"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die
}
src_install() {
einfo "Installing PyPy ..."
insinto "/usr/$(get_libdir)/pypy"
doins -r include lib_pypy lib-python pypy-c
fperms a+x ${INSDESTTREE}/pypy-c
#needed even without jit :(
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
insinto "/usr/$(get_libdir)/pypy3"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
dodoc README.rst
if ! use gdbm; then
rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_gdbm.py || die
fi
if ! use sqlite; then
rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/sqlite3 \
"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_sqlite.py || die
fi
if ! use tk; then
rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/{idlelib,tkinter} \
"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
use doc && dohtml -r pypy/doc/_build/html/
#use doc && dohtml -r pypy/doc/_build/html/
einfo "Generating caches and byte-compiling ..."
python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
python_export pypy3 EPYTHON PYTHON PYTHON_SITEDIR
local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
echo "EPYTHON='${EPYTHON}'" > epython.py
python_domodule epython.py
# Note: call portage helpers before this line.
# PYTHONPATH confuses them and will result in random failures.
local -x PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7"
# Generate Grammar and PatternGrammar pickles.
"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
|| die "Generation of Grammar and PatternGrammar pickles failed"
# Generate cffi cache
# Please keep in sync with pypy/tool/release/package.py!
"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
if use gdbm; then
"${PYTHON}" -c "import _gdbm" || die "Failed to import gdbm (cffi)"
fi
if use sqlite; then
"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
fi
@ -158,6 +164,10 @@ src_install() {
"${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
fi
# Cleanup temporary objects
find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
# compile the installed modules
python_optimize "${ED%/}${INSDESTTREE}"
}

@ -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/pypy3/pypy3-2.4.0.ebuild,v 1.1 2014/11/05 23:03:06 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy3/pypy3-2.4.0.ebuild,v 1.2 2014/11/09 08:29:14 mgorny Exp $
EAPI=5
@ -15,7 +15,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 gdbm +jit low-memory ncurses sandbox shadowstack sqlite sse2 tk"
RDEPEND=">=sys-libs/zlib-1.1.3:0=

@ -1 +0,0 @@
DIST sparqlwrapper-1.5.2.tar.gz 24953 SHA256 65254c7c3cae093fbd5e6b65e2c725db3ad80ab7402c4aa59d18a9cb8f5695b4 SHA512 adb70599d5c67c4cbd5277de30325a993057ff50c72eba89cea6b5ba8daea9bd7717fef4cd62e250b77c818498580d7f26e359fc4a9e344b2ba82c71912fcee3 WHIRLPOOL a8231a0745e798240620f46af625ff325a770f97f100fbfa5cda4f2e8e1dd1f8b8900fae13a8ade9ba0f71a3fc714be14d83e34848479e7a4e93c7993a1b207c

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
</pkgmetadata>

@ -1,23 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/sparqlwrapper/sparqlwrapper-1.5.2.ebuild,v 1.2 2014/04/14 08:06:05 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
inherit distutils-r1
MY_P="SPARQLWrapper"
DESCRIPTION="A wrapper around a SPARQL service"
HOMEPAGE="http://sparql-wrapper.sourceforge.net/"
SRC_URI="mirror://pypi/S/${MY_P}/${MY_P}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="W3C"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND=">=dev-python/rdflib-2.4.2[${PYTHON_USEDEP}]"
S="${WORKDIR}/${MY_P}-${PV}"

@ -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-ruby/merb-assets/merb-assets-1.1.3.ebuild,v 1.4 2014/08/02 01:34:18 mrueg Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/merb-assets/merb-assets-1.1.3.ebuild,v 1.5 2014/11/09 08:00:56 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
@ -23,3 +23,8 @@ IUSE=""
ruby_add_bdepend "test? ( dev-ruby/rspec:0 )"
ruby_add_rdepend "~dev-ruby/merb-core-${PV}"
all_ruby_prepare() {
# Fix obsolete rake tasks.
sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
}

@ -1,2 +1 @@
DIST ruby-prof-0.12.2.tgz 207987 SHA256 baf4aae2c156df6871c94469f46c708d0abe661c3c2bd91c6a1e1e9a06fdbeeb SHA512 1efaa8679d1d25e085cfaaeb588e4020ac0203b27bc0a526e6c5b811d638dbfc7a5be7d3d8e6700f3de10adb3f956bfd27d270cbe14de35e73796a2f2c26fe1e WHIRLPOOL 338c223621db4a390aa63c57ad74027b46e098cdab5fb4faf4e3572d593e89392551f7de4416db01fd3dedd5e9ec84a07793c888a7156c8e69e90261ca7734d2
DIST ruby-prof-0.15.1.tgz 207847 SHA256 c0305095274bbead21b323812acc63c0051b387dd92bd23f8edc28b03b00f7af SHA512 3b94e07c76aa51381e964095777dd8c45288319f6b0f56b886a95fc220a95da0db5da311624635c64725298298c66cbac6dc6fcbc293be2aef462b003a78019b WHIRLPOOL d75f53845c5a91b624fa1da67c507f89537650c3db25a0b21e0a0dfb4e3ad91bc82578c861b3ba60b6fa24689f7eab0b08c77aed0680b0e7c304aad1ea288854

@ -1,65 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-prof/ruby-prof-0.12.2.ebuild,v 1.2 2014/05/07 19:09:28 mrueg Exp $
EAPI=5
# jruby → not compatible, since it uses an extension, but there is a bug
# open for it: https://github.com/rdp/ruby-prof/issues/36
USE_RUBY="ruby19"
RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
RUBY_FAKEGEM_DOCDIR="doc"
inherit multilib ruby-fakegem
DESCRIPTION="A module for profiling Ruby code"
HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
SRC_URI="https://github.com/ruby-prof/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
all_ruby_prepare() {
# The thread testing in 0.8.1 and earlier versions is broken, it
# has to be tested for the next versions, since upstream is
# looking for a solution. The problem is that it's _very_
# timing-dependent.
rm "${S}"/test/thread_test.rb \
|| die "unable to remove broken test unit"
sed -i -e '/thread_test/d' \
test/test_suite.rb || die "unable to remove broken test reference"
# We install the shared object in lib, not ext.
sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb
# Create directory required for the test suite to pass
mkdir tmp || die
}
each_ruby_configure() {
${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
}
each_ruby_compile() {
emake -Cext/ruby_prof || die "build failed"
mkdir lib/ruby_prof || die "unable to create directory for shared object"
cp ext/ruby_prof/*$(get_modname) lib/ruby_prof || die "copy of extension failed"
}
each_ruby_test() {
${RUBY} test/test_suite.rb || die
}
all_ruby_install() {
all_fakegem_install
for dir in examples ; do
docinto "$dir"
dodoc -r "$dir"/*
done
}

@ -1,3 +1,2 @@
DIST term-ansicolor-1.0.7.gem 16896 SHA256 625416d740c94a8356415c4151069966fb21dd8e346282a1d1757d5095539b62 SHA512 a7e9b75d781960ae977293229eff21f3dfdbe6b2ad305efcd97b9be37fc4027edbbdcb699ed669f1103936a834a5310fac643261181bbaacfe9f146097b6b692 WHIRLPOOL a7f3742468fee465b639a04a01b508bad70a334524c83dfbd8c3a99ec461e1374267e333844164bbcb60fc433d64524315ce36e98d80071193fe0b01e0a6d9c9
DIST term-ansicolor-1.2.2.gem 889856 SHA256 b9534713ba4c2a48f2291fadf9ce2edae9f2dc96157ee812fe8fe16a70c081ac SHA512 c1ad873f47d2d0d0677d9c9229531cc341ab1650acf5b9a7704a4739796c9b7dfa6357ce60708b3e0efeb342837d9f23acc178005c4eae6b077a27f20a69eb15 WHIRLPOOL 5842abfa00a8a79f11fe6ebcee154fb2730c75786e45414ca382db946ce3d65652d6c5c8164988231f982100fc02e22612206eeb7cfe1e3e2985343316e12e0c
DIST term-ansicolor-1.3.0.gem 890368 SHA256 8b5caf6839a0c1bbf7a55a9d2fbd3c172f623fa05c427f9b3ea5d75bdfe14fa8 SHA512 ee039f4b5ecf8646b5c12c8d50f01c85b0dff0ab61f37199213407e29c4b4026cf44e5b12043a74a26a597a0a2572a282adcea21f5b8d2c5bb822fca4dfbdc1e WHIRLPOOL 1cdd9cfe7726415a890dc179f3c14b26fd61ccc81621a17c57e62821cc71daf783cdc93bf40a33da9705eb80615ec7dfbe67c30d61d6bcd492b9b83478f632c5

@ -1,37 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/term-ansicolor/term-ansicolor-1.0.7.ebuild,v 1.15 2014/08/05 16:00:40 mrueg Exp $
EAPI=4
USE_RUBY="jruby ruby19"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_RECIPE_TEST="none"
RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc"
RUBY_FAKEGEM_GEMSPEC="term-ansicolor.gemspec"
# don't install a cdiff wrapper, collides with app-misc/colordiff (bug
# #310073).
RUBY_FAKEGEM_BINWRAP="decolor"
inherit ruby-fakegem
DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
HOMEPAGE="http://term-ansicolor.rubyforge.org/"
LICENSE="GPL-2"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
each_ruby_test() {
${RUBY} -Ilib tests/ansicolor_test.rb || die
}
all_ruby_install() {
all_fakegem_install
docinto examples
dodoc examples/*
}

@ -1,2 +1,3 @@
DIST turbolinks-2.2.2.gem 18944 SHA256 64d999fa191ed4bd9a52dfa4d5a268c3682801ca41b8d85c912c292e0b67c471 SHA512 87f53c77ee23454f03d74790f8e503a31c39c35f45f957fe00528ed187fd42adc9b2d12313b9b4bcc1449a83b5760a219cda2e04420911dfed6a867d20f03dc7 WHIRLPOOL d91342209bc23fdbed2f2731a29eb738ba1aacabb233fe9932cb9e74cd5482bc7985d29e460c670e903a2c6be586fbc4e647545e909998bf87f00a19cf8d2d09
DIST turbolinks-2.2.3.gem 19456 SHA256 c280d72d0c1f78a4bd48cd9f487b969e6270522f5dc66505ff30b7f015c73db5 SHA512 7acc39ed371d2a1b5a44a3b22a8078c39cf27223300ec289fd9a99bf8e3f36e98b221ae5962d70600ad072538bdbf103cb5dd559e80921b2bf11401273468a3c WHIRLPOOL 3a5420cbace4ccabcf2f0077890d5487b3ff4a32e5c40881751722ebd41a307b91c9aac373c0d017083760b4f0c8ae614b7d85e929b94c3102781cd4735d63c1
DIST turbolinks-2.5.1.gem 21504 SHA256 a5daa156152cea92b3b5b348ac16a0100c9039603b5f8ac77b89af489b3f7fc7 SHA512 2f2eed08ad96e10c8bd59c055c827104d1ad5c50919543dac3b3d90910fac86cc7a042cc4d54b010100bd7d51b309aab354d2bb5a4469dbbd20c232c22f35392 WHIRLPOOL 3ba840f11b49c6387a7e4cf6fbbe4ea5df1ed378392bc884409637a57170f7fc1d8172ed7dc06889a9291a8ba9b83bb9073153aacda883cbb8e4396954f00f14

@ -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/dev-ruby/turbolinks/turbolinks-2.5.1.ebuild,v 1.2 2014/11/09 07:46:59 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
# The gem does not contain runnable tests.
RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_EXTRADOC="README.md"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
inherit ruby-fakegem
DESCRIPTION="Makes following links in your web application faster"
HOMEPAGE="https://github.com/rails/turbolinks"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
ruby_add_rdepend "dev-ruby/coffee-rails"

@ -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-util/buildbot/buildbot-0.8.9-r1.ebuild,v 1.1 2014/10/18 15:19:24 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.9-r1.ebuild,v 1.2 2014/11/09 10:12:20 hwoarang Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
@ -83,19 +83,6 @@ src_install() {
newinitd "${FILESDIR}/buildmaster.initd" buildmaster
systemd_dounit "${FILESDIR}"/${PN}.service
# In case of multiple masters, it's possible to edit web files
# so all master can share the changes. So protect them!
# If something else need to be protected, please open a bug
# on http://bugs.gentoo.org
local cp
add_config_protect() {
cp+=" $(python_get_sitedir)/${PN}/status/web"
}
python_execute_function -q add_config_protect
echo "CONFIG_PROTECT=\"${cp}\"" \
> 85${PN} || die
doenvd 85${PN}
readme.gentoo_create_doc
}

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

Loading…
Cancel
Save