diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index dfec19fd8109..2a7f808c610f 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -3,4 +3,5 @@ DIST doxygen-1.7.6.1.src.tar.gz 4791654 SHA256 0e60e794fb172d3fa4a9a9535f0b8e0ee
DIST doxygen-1.8.3.1.src.tar.gz 6196887 SHA256 0c749f68101b6c04ccb0d9696dd37836a6ba62cd8002add275058a975ee72b55 SHA512 365e553364ad61950a29477d8e751e98f4af9ce4a999c788cd25ce5a58ebbd931960689c4faddabd71cda60174777e41ed814ba633c19287c9f9696e0d7fa169 WHIRLPOOL cab6bbad971b794e07e95bee548ed9b9233b7b420dd96db8d4cb7b68a1b1232546c3976556b043e9a31c2e32e8619a57a0a7a58aa846a4806b9cc08aa1a9bc80
DIST doxygen-1.8.4.src.tar.gz 6456090 SHA256 526442fb70bea79a4086cc98c22692cc05edc2f4cf231feb7993b5d188ef584e SHA512 984b4aa88afd3edb067e054b08de624f8afe927d31a45466349e83aa125e061c1ecac2d5f021e0d345fddf3ed7d5211509a445433af54d629a09bbb24b27e026 WHIRLPOOL d5137d0c2cbda8d1d768b1a92b6778312862d3cb4113c9be59489f061d0ad80c5162417d8bf9efef54852b23f985390791049c843a45be5eafcd586628f96d9c
DIST doxygen-1.8.5.src.tar.gz 6511944 SHA256 243a8b67db12ad68d6ea5b51c6f60dc2cc3a34fa47abf1b5b4499196c3d7cc25 SHA512 56d2b262feae41fe9acf3c0c8ad3dd1d8868a52c17e2d9882a553570311482ec73548c0a70ae0ad7ccd7d1011a69968f284031beb93f915bab3a4c740b943f47 WHIRLPOOL 934cb01d7898cbdf04d2f293534ade1b8ce1c48a378fb141e063a83455ccf94c733aec525e6e6740e6b92fb473a6bc2b31dca09b0324de78801c7a2d19638182
+DIST doxygen-1.8.8.src.tar.gz 4955485 SHA256 158e7834f05e0aeea5794b23c1e775ddfebafc709543e47f6fff9d81b190ade1 SHA512 f9cdc7b5ce18321449f29ec86d0824f34d22bf41e2007224d266e68520141e8e21553dab2add361795dc23c56845f7e118b11298ecbed061b25ffabf638a79c1 WHIRLPOOL 26497b9ed9d4236d3937ac98f61593747fe1608d41dbec7649524d060adce104355f08d1a8cab19f4c93594034d2245380b3c927e3995515b4bbdcb5614a5f52
DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
diff --git a/app-doc/doxygen/doxygen-1.8.5.ebuild b/app-doc/doxygen/doxygen-1.8.5.ebuild
index ad4973208334..3361f0c029a6 100644
--- a/app-doc/doxygen/doxygen-1.8.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.5.ebuild
@@ -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-doc/doxygen/doxygen-1.8.5.ebuild,v 1.14 2014/09/03 17:10:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild,v 1.15 2014/12/24 14:48:58 tamiko Exp $
EAPI=4
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -96,7 +96,7 @@ src_prepare() {
|| die
# Ensure we link to -liconv
- if use elibc_FreeBSD; then
+ if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
for pro in */*.pro.in */*/*.pro.in; do
echo "unix:LIBS += -liconv" >> "${pro}"
done
diff --git a/app-doc/doxygen/doxygen-1.8.8.ebuild b/app-doc/doxygen/doxygen-1.8.8.ebuild
new file mode 100644
index 000000000000..451b1c164b06
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.8.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.8.ebuild,v 1.3 2014/12/24 18:06:29 tamiko Exp $
+
+EAPI=4
+PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
+
+inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="http://www.doxygen.org/"
+SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+ http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="clang debug doc dot doxysearch qt4 latex sqlite elibc_FreeBSD elibc_uclibc userland_GNU"
+
+#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
+
+LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
+nl nb pl pt ro ru sl sk sr sv tr uk vi af)
+for X in "${LANGS[@]}" ; do
+ IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="app-text/ghostscript-gpl
+ dev-lang/perl
+ media-libs/libpng
+ virtual/libiconv
+ clang? ( sys-devel/clang )
+ dot? (
+ media-gfx/graphviz
+ media-libs/freetype
+ )
+ doxysearch? ( =dev-libs/xapian-1.2* )
+ latex? ( app-text/texlive[extra] )
+ qt4? ( dev-qt/qtgui:4 )
+ sqlite? ( dev-db/sqlite:3 )
+ "
+
+DEPEND="sys-apps/sed
+ sys-devel/flex
+ sys-devel/bison
+ doc? ( ${PYTHON_DEPS} )
+ ${RDEPEND}"
+
+# src_test() defaults to make -C testing but there is no such directory (bug #504448)
+RESTRICT="mirror test"
+EPATCH_SUFFIX="patch"
+
+get_langs() {
+ # using only user set linguas also fixes #263641
+ my_linguas=()
+ for lingua in ${LINGUAS}; do
+ if has ${lingua} "${LANGS[@]}"; then
+ case ${lingua} in
+ hy) lingua=am ;;
+ pt_BR) lingua=br ;;
+ zh*) lingua=cn ;;
+ cs) lingua=cz ;;
+ da) lingua=dk ;;
+ el*) lingua=gr ;;
+ ja*) lingua=jp ;;
+ ko) lingua=kr ;;
+ nb) lingua=no ;;
+ sl) lingua=si ;;
+ tr*) lingua=tr ;;
+ uk) lingua=ua ;;
+ af) lingua=za ;;
+ esac
+ has ${lingua} "${my_linguas[@]}" ||
+ my_linguas+=(${lingua})
+ fi
+ done
+ f_langs="${my_linguas[@]}"
+ echo ${f_langs// /,}
+}
+
+pkg_setup() {
+ tc-export CC CXX
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # use CFLAGS, CXXFLAGS, LDFLAGS
+ export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
+
+ sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
+ -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
+ -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
+ -e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \
+ -e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \
+ -e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \
+ -e "s:^\(TMAKE_CC\s*\)=.*$:\1= $(tc-getCC):" \
+ -e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \
+ tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \
+ || die
+
+ # Ensure we link to -liconv
+ if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
+ for pro in */*.pro.in */*/*.pro.in; do
+ echo "unix:LIBS += -liconv" >> "${pro}"
+ done
+ fi
+
+ # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+ sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+ # prefix search tools patch, plus OSX fixes
+ epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch
+ epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348
+
+ # fix pdf doc
+ sed -i.orig -e "s:g_kowal:g kowal:" \
+ doc/maintainers.txt || die
+
+ sed -e "s/\$(DATE)/$(LC_ALL="C" LANG="C" date)/g" \
+ -i Makefile.in || die #428280
+
+ if is-flagq "-O3" ; then
+ echo
+ ewarn "Compiling with -O3 is known to produce incorrectly"
+ ewarn "optimized code which breaks doxygen."
+ echo
+ elog "Continuing with -O2 instead ..."
+ echo
+ replace-flags "-O3" "-O2"
+ fi
+}
+
+src_configure() {
+ # set ./configure options (prefix, Qt based wizard, docdir)
+
+ local my_conf="--shared --enable-langs $(get_langs)"
+
+ if use debug ; then
+ my_conf="${my_conf} --debug"
+ else
+ my_conf="${my_conf} --release "
+ fi
+
+ use clang && my_conf="${my_conf} --with-libclang"
+
+ use doxysearch && my_conf="${my_conf} --with-doxysearch"
+
+ use qt4 && my_conf="${my_conf} --with-doxywizard"
+
+ use sqlite && my_conf="${my_conf} --with-sqlite3"
+
+ # On non GNU userland (e.g. BSD), configure script picks up make and bails
+ # out because it is not GNU make, so we force the right value.
+ use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
+
+ export LINK="${QMAKE_LINK}"
+ export LINK_SHLIB="${QMAKE_CXX}"
+
+ ./configure --prefix "${EPREFIX}/usr" ${my_conf} \
+ || die
+
+ if use qt4 ; then
+ pushd addon/doxywizard &> /dev/null
+ eqmake4 doxywizard.pro -o Makefile.doxywizard
+ popd &> /dev/null
+ fi
+}
+
+src_compile() {
+
+ emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \
+ LFLAGS+="${ELDFLAGS}" all
+
+ # generate html and pdf (if tetex in use) documents.
+ # errors here are not considered fatal, hence the ewarn message
+ # TeX's font caching in /var/cache/fonts causes sandbox warnings,
+ # so we allow it.
+ if use doc; then
+ if ! use dot; then
+ sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
+ {Doxyfile,doc/Doxyfile} \
+ || ewarn "disabling dot failed"
+ fi
+ if use latex; then
+ addwrite /var/cache/fonts
+ addwrite /var/cache/fontconfig
+ addwrite /usr/share/texmf/fonts/pk
+ addwrite /usr/share/texmf/ls-R
+ make pdf || ewarn '"make pdf docs" failed.'
+ else
+ cp doc/Doxyfile doc/Doxyfile.orig
+ cp doc/Makefile doc/Makefile.orig
+ sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \
+ doc/Doxyfile
+ sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
+ -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+ -e "s/@sed/# @sed/" doc/Makefile
+ make docs || ewarn '"make docs" failed.'
+ fi
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" MAN1DIR=share/man/man1 install
+
+ if use qt4; then
+ doicon "${DISTDIR}/doxywizard.png"
+ make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+ "/usr/share/pixmaps/doxywizard.png" \
+ "Development"
+ fi
+
+ dodoc LANGUAGE.HOWTO README.md
+
+ # pdf and html manuals
+ if use doc; then
+ dohtml -r html/*
+ use latex && dodoc latex/doxygen_manual.pdf
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+
+ elog
+ elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
+ elog "the html and pdf documentation, respectively. For examples"
+ elog "and other goodies, see the source tarball. For some example"
+ elog "output, run doxygen on the doxygen source using the Doxyfile"
+ elog "provided in the top-level source dir."
+ elog
+ elog "Disabling the dot USE flag will remove the GraphViz dependency,"
+ elog "along with Doxygen's ability to generate diagrams in the docs."
+ elog "See the Doxygen homepage for additional helper tools to parse"
+ elog "more languages."
+ elog
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-doc/doxygen/metadata.xml b/app-doc/doxygen/metadata.xml
index 2285cad29d9c..01f4e82f7096 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/metadata.xml
@@ -9,7 +9,9 @@
as well as other languages (using additional helper tools).
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 3dd8ad43c9e3..f8470b504afd 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,2 +1,3 @@
+DIST libvirt-1.2.10-20141223.tar.xz 5012 SHA256 a1d31d12f04631e46748b6dfc6893d20127bd97204415c9642b1af68077d68b4 SHA512 70148beb288d0df468bd3c82b42da1ccae54f4914514f7bd9817a4aa6e6bb54d21aba58ce9ab6cb35ec539af8c6ce9f5c2f91f1a67f29824bcf0a13e6c1a2975 WHIRLPOOL 0569ad4b4222f968684ab2e108bd761bdb750eb59348e70c38ebc809a9ee0cb74445126d2517f5b660a5600d4de9c20d3f3d7f96abff1cc9d3e2b5a834fc87f4
DIST libvirt-1.2.10.tar.gz 30029503 SHA256 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e SHA512 9cd5d2a604769cf70e388c367abcde27ee8d6d7043227f17dd2cac92a467ea06547374e1d83c7b1ee4c5322d8b3d9e4cbb6db373efae5eaaceed1b1376cbd09d WHIRLPOOL 986c1fd0128101f936897c97a36d646b8893d9ee0a223d05b004d73408a2720aeb9bb5fe3e4a7c476947021b89d955fb4a1b3a64dfe8dfe0d30dbfe75487b8fe
DIST libvirt-1.2.11.tar.gz 30571605 SHA256 1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc SHA512 4aaeb2eeb563f0a9105a1586054d69c24dada12ddf9b71edd3742ad602eb8c892d9f615ee1a2159051bec52699897c6707d9d0204b8f0fe61bae15885ee986f2 WHIRLPOOL b64ee58d633e4b3fec52125bd9b582f7d07045baa66c492fd2b6bc521d994cec95fa460c3a8b32a0f73043ad812e36d81832c31046bbacc280fb2f2764e9bd75
diff --git a/app-emulation/libvirt/files/libvirt-1.2.9-cve-2014-7823.patch b/app-emulation/libvirt/files/libvirt-1.2.9-cve-2014-7823.patch
deleted file mode 100644
index 7d0d655214cc..000000000000
--- a/app-emulation/libvirt/files/libvirt-1.2.9-cve-2014-7823.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Patch from: https://www.redhat.com/archives/libvir-list/2014-November/msg00114.html
-
-Backported to version 1.2.9: (Matthias Maier )
-In libvirt versions prior to 1.2.10 the function
- char*
- virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
-is defined in libvirt.c
-
-
-From: Eric Blake
-To: libvir-list redhat com
-Subject: [libvirt] [PATCH] CVE-2014-7823: dumpxml: security hole with migratable flag
-Date: Wed, 5 Nov 2014 17:30:46 +0100
----
-
-Commit 28f8dfd (v1.0.0) introduced a security hole: in at least
-the qemu implementation of virDomainGetXMLDesc, the use of the
-flag VIR_DOMAIN_XML_MIGRATABLE (which is usable from a read-only
-connection) triggers the implicit use of VIR_DOMAIN_XML_SECURE
-prior to calling qemuDomainFormatXML. However, the use of
-VIR_DOMAIN_XML_SECURE is supposed to be restricted to read-write
-clients only. This patch treats the migratable flag as requiring
-the same permissions, rather than analyzing what might break if
-migratable xml no longer includes secret information.
-
-Fortunately, the information leak is low-risk: all that is gated
-by the VIR_DOMAIN_XML_SECURE flag is the VNC connection password;
-but VNC passwords are already weak (FIPS forbids their use, and
-on a non-FIPS machine, anyone stupid enough to trust a max-8-byte
-password sent in plaintext over the network deserves what they
-get). SPICE offers better security than VNC, and all other
-secrets are properly protected by use of virSecret associations
-rather than direct output in domain XML.
-
-* src/remote/remote_protocol.x (REMOTE_PROC_DOMAIN_GET_XML_DESC):
-Tighten rules on use of migratable flag.
-* src/libvirt-domain.c (virDomainGetXMLDesc): Likewise.
-
-Signed-off-by: Eric Blake
----
-
-The libvirt-security list agreed that this did not need an embargo
-because it is low-risk; but I'm on the road this week, so while
-this patch for master can go in now, I won't complete the backport
-to all the affected stable branches (everything since v1.0.0) or
-do the Libvirt Security Notice writeup until Monday.
-
- src/libvirt-domain.c | 3 ++-
- src/remote/remote_protocol.x | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/libvirt.c b/src/libvirt.c
-index 7dc3146..2b0defc 100644
---- a/src/libvirt.c
-+++ b/src/libvirt.c
-@@ -4369,7 +4369,8 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
- virCheckDomainReturn(domain, NULL);
- conn = domain->conn;
-
-- if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) {
-+ if ((conn->flags & VIR_CONNECT_RO) &&
-+ (flags & (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_MIGRATABLE))) {
- virReportError(VIR_ERR_OPERATION_DENIED, "%s",
- _("virDomainGetXMLDesc with secure flag"));
- goto error;
-diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
-index db12cda..ebf4530 100644
---- a/src/remote/remote_protocol.x
-+++ b/src/remote/remote_protocol.x
-@@ -3255,6 +3255,7 @@ enum remote_procedure {
- * @generate: both
- * @acl: domain:read
- * @acl: domain:read_secure:VIR_DOMAIN_XML_SECURE
-+ * @acl: domain:read_secure:VIR_DOMAIN_XML_MIGRATABLE
- */
- REMOTE_PROC_DOMAIN_GET_XML_DESC = 14,
-
---
-1.9.3
-
diff --git a/app-emulation/libvirt/libvirt-1.2.10-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild
similarity index 95%
rename from app-emulation/libvirt/libvirt-1.2.10-r2.ebuild
rename to app-emulation/libvirt/libvirt-1.2.10-r3.ebuild
index 181393b5456d..373b0658a00c 100644
--- a/app-emulation/libvirt/libvirt-1.2.10-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild
@@ -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/libvirt/libvirt-1.2.10-r2.ebuild,v 1.3 2014/12/12 09:10:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.10-r3.ebuild,v 1.3 2014/12/24 13:19:24 ago Exp $
EAPI=5
@@ -10,6 +10,8 @@ MY_P="${P/_rc/-rc}"
inherit eutils user autotools linux-info systemd readme.gentoo
+BACKPORTS="20141223"
+
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
@@ -19,9 +21,13 @@ if [[ ${PV} = *9999* ]]; then
else
# Versions with 4 numbers are stable updates:
if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
- SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
+ SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
+ ${BACKPORTS:+
+ http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
else
- SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
+ SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+ ${BACKPORTS:+
+ http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
fi
KEYWORDS="amd64 x86"
SLOT="0/${PV}"
@@ -219,12 +225,11 @@ src_prepare() {
) >.git-module-status
fi
- epatch \
- "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
- "${FILESDIR}"/${PN}-1.2.9-fix-firewalld-configuration.patch \
- "${FILESDIR}"/${P}-cve-2014-7823.patch \
- "${FILESDIR}"/${P}-cve-2014-8131.patch \
- "${FILESDIR}"/${P}-cve-2014-8131-part2.patch
+ epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
+ epatch "${FILESDIR}"/${PN}-1.2.9-fix-firewalld-configuration.patch
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/patches" epatch
epatch_user
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 4bc0eca045e4..dbf64aadaaee 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,4 @@
DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
+DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41
DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221
diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
new file mode 100644
index 000000000000..c1fc195e3937
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
@@ -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-i18n/ibus/ibus-1.5.9-r1.ebuild,v 1.1 2014/12/24 01:52:20 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+UPSTREAM_VER=0
+
+inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test +vala wayland +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+ deprecated? ( python )
+ python? (
+ ${PYTHON_REQUIRED_USE}
+ || ( deprecated ( gtk3 introspection ) ) )" #342903
+
+[[ -n ${UPSTREAM_VER} ]] && \
+ UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+ ${UPSTRAM_PATCHSET_URI}"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.26:2
+ gnome-base/librsvg:2
+ sys-apps/dbus[X?]
+ app-text/iso-codes
+ >=gnome-base/dconf-0.13.4
+ x11-libs/libnotify
+
+ gconf? ( >=gnome-base/gconf-2.12:2 )
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ python? ( ${PYTHON_DEPS} )
+ X? (
+ x11-libs/libX11
+ x11-libs/gtk+:2 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+ nls? ( virtual/libintl )
+ wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+ x11-apps/setxkbmap
+ python? (
+ dev-python/pyxdg
+ deprecated? (
+ >=dev-python/dbus-python-0.83
+ dev-python/pygobject:2
+ dev-python/pygtk:2 )
+ gtk3? (
+ dev-python/pygobject:3
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/pango[introspection]
+ x11-libs/gtk+:3[introspection] )
+ )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-lang/perl-5.8.1
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ virtual/pkgconfig
+ nls? ( >=sys-devel/gettext-0.16.1 )
+ vala? ( $(vala_depend) )
+ gnome-base/gconf"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_OPTS="-p1" \
+ epatch "${WORKDIR}"/patches-upstream
+ fi
+
+ # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+ sed -e 's/dconf update/:/' \
+ -i data/dconf/Makefile.{am,in} || die
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local python_conf
+ if use python; then
+ python_conf="PYTHON=${PYTHON}
+ $(use_enable deprecated python-library)
+ $(use_enable gtk3 setup)"
+ else
+ python_conf="--disable-python-library --disable-setup"
+ fi
+ econf \
+ --enable-dconf \
+ $(use_enable introspection) \
+ $(use_enable gconf) \
+ $(use_enable gtk gtk2) \
+ $(use_enable gtk xim) \
+ $(use_enable gtk3) \
+ $(use_enable gtk3 ui) \
+ $(use_enable nls) \
+ $(use_enable test tests) \
+ $(use_enable X xim) \
+ $(use_enable vala) \
+ $(use_enable wayland) \
+ ${python_conf}
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check || die
+}
+
+src_install() {
+ default
+
+ prune_libtool_files --all
+
+ mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+ rm -rf "${ED}"/usr/share/bash-completion || die
+ newbashcomp "${T}"/ibus.bash ${PN}
+ insinto /etc/X11/xinit/xinput.d
+ newins xinput-ibus ibus.conf
+
+ keepdir /usr/share/ibus/{engine,icons} #289547
+
+ use deprecated && python_optimize
+ use python && use gtk3 && python_optimize
+
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ use gconf && gnome2_gconf_savelist
+ gnome2_schemas_savelist
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ use gconf && gnome2_gconf_install
+ use gtk && gnome2_query_immodules_gtk2
+ use gtk3 && gnome2_query_immodules_gtk3
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ use gtk && gnome2_query_immodules_gtk2
+ use gtk3 && gnome2_query_immodules_gtk3
+ use gconf && gnome2_schemas_update
+ gnome2_schemas_savelist
+ gnome2_icon_cache_update
+}
diff --git a/app-misc/ltunify/ltunify-0.2-r1.ebuild b/app-misc/ltunify/ltunify-0.2-r1.ebuild
index 6483caa663ef..961181d7d83a 100644
--- a/app-misc/ltunify/ltunify-0.2-r1.ebuild
+++ b/app-misc/ltunify/ltunify-0.2-r1.ebuild
@@ -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-misc/ltunify/ltunify-0.2-r1.ebuild,v 1.1 2014/11/25 02:14:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ltunify/ltunify-0.2-r1.ebuild,v 1.2 2014/12/24 12:15:47 mrueg Exp $
EAPI=5
inherit toolchain-funcs udev
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
src_prepare() {
sed -i '/^override CFLAGS/d' Makefile || die
-
+
# allow plugdev group r/w access
sed -i 's/^#MODE=/MODE=/' udev/42-logitech-unify-permissions.rules || die
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index a97435e3a727..90393f86e960 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,4 @@
DIST tracker-1.0.2.tar.xz 6046600 SHA256 73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4 SHA512 65a0324948ff6287c122a0de6356372cae366d1c8f0161f551a88c2e442c42066787333192acf6bc173dcdcc709ce9f58e5f88f660c1b5c9409363c680c50f8f WHIRLPOOL 7aa00e80094b441a774ff5cca7b0ceb1dbad69062124b371120d6fc049784b9f6e3b87f040bf02d4e4cacddd80184939b754a0b1d24c4f55242cd23eba2dde65
DIST tracker-1.0.5.tar.xz 6061704 SHA256 9e77f8f731f44782a1468cc6dcf7f76bc9d7d7eb462c1b34062981a9c348ef16 SHA512 d5601a1d89bd6da52750b55a742005897fc4c4bd2280a5e56c462b3542473b8172d21c1e3a57cdb3e81c3ed5ed7810510e82e601fa43723df3c41a3100f61fd7 WHIRLPOOL 1165cd8a0e29fa13fe6a0410b8f9de3d277fc032496a13d2c6bca1cd9187d5bfc829ea05380d22a3262ac966a422a8bd85a9ab0fc4d7ffc8b76bddabdd2634e8
DIST tracker-1.0.6.tar.xz 5975264 SHA256 e351ac3c182fc740afdc651d3884f8af0a8f897948a9ecc784d91bb1f9af62f9 SHA512 687ba883513a6854e99e3adc0fc5cfd2e2fb66b38486079ed178bd7c5730def4e5a8e07de32f081b30d9ac93dca5418d5c9ba782c3f80c539b3fa05b829b4b17 WHIRLPOOL 1c289d84ce63638e4a141b34d316dfaa69df26f58ac8f72154ee30e0a0bd60c3b14255cd5d900f671dd79f46d48cf3952f13b6f2e391e4b32320aca6e540a58f
+DIST tracker-1.2.5.tar.xz 6033708 SHA256 1e614bc33f93d5820f3c90510e11210bf34d02dba6ccbd3dc30097758a6d31aa SHA512 8b2027e4350286d1d9c8274aa7addf0653f116389584b2cea35dc9d68563135340ac89873027d531beea2cce44b20d4a9718d6986fb486a2ef77f9cab8189699 WHIRLPOOL 4e1e923106a4b732029db9e12d8e4576aa71db64a803b8afc91f0d41793a6d22f8eb7654d0b3ac71af21ab5061432ddae1db0b3afc97d019c246c4eabf1f14d3
diff --git a/app-misc/tracker/tracker-1.2.5.ebuild b/app-misc/tracker/tracker-1.2.5.ebuild
new file mode 100644
index 000000000000..92bcea96cb1b
--- /dev/null
+++ b/app-misc/tracker/tracker-1.2.5.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.2.5.ebuild,v 1.1 2014/12/23 23:58:12 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+VALA_MIN_API_VERSION="0.18"
+
+inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/100"
+IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
+gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager
+pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+ ?? ( gstreamer ffmpeg )
+ cue? ( gstreamer )
+ upnp-av? ( gstreamer )
+ !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
+"
+
+# According to NEWS, introspection is non-optional
+# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
+# sqlite-3.7.16 for FTS4 support
+RDEPEND="
+ >=app-i18n/enca-1.9
+ >=dev-db/sqlite-3.7.16:=
+ >=dev-libs/glib-2.40:2
+ >=dev-libs/gobject-introspection-0.9.5
+ >=dev-libs/icu-4.8.1.1:=
+ || (
+ >=media-gfx/imagemagick-5.2.1[png,jpeg=]
+ media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
+ >=media-libs/libpng-1.2:0=
+ >=media-libs/libmediaart-0.5:1.0
+ >=x11-libs/pango-1:=
+ sys-apps/util-linux
+
+ cue? ( media-libs/libcue )
+ eds? (
+ >=mail-client/evolution-3.3.5:=
+ >=gnome-extra/evolution-data-server-3.3.5:=
+ =sys-libs/glibc-2.12 )
+ exif? ( >=media-libs/libexif-0.6 )
+ ffmpeg? ( >=virtual/ffmpeg-9 )
+ firefox-bookmarks? ( || (
+ >=www-client/firefox-4.0
+ >=www-client/firefox-bin-4.0 ) )
+ flac? ( >=media-libs/flac-1.2.1 )
+ gif? ( media-libs/giflib )
+ gsf? ( >=gnome-extra/libgsf-1.14.24 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+ gtk? (
+ >=dev-libs/libgee-0.3:0.8
+ >=x11-libs/gtk+-3:3 )
+ iptc? ( media-libs/libiptcdata )
+ iso? ( >=sys-libs/libosinfo-0.2.9:= )
+ jpeg? ( virtual/jpeg:0 )
+ upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) )
+ mp3? ( >=media-libs/taglib-1.6 )
+ networkmanager? ( >=net-misc/networkmanager-0.8 )
+ pdf? (
+ >=x11-libs/cairo-1:=
+ >=app-text/poppler-0.16:=[cairo,utils]
+ >=x11-libs/gtk+-2.12:2 )
+ playlist? ( >=dev-libs/totem-pl-parser-3 )
+ rss? ( net-libs/libgrss:0.5 )
+ thunderbird? ( || (
+ >=mail-client/thunderbird-5.0
+ >=mail-client/thunderbird-bin-5.0 ) )
+ tiff? ( media-libs/tiff )
+ upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
+ vorbis? ( >=media-libs/libvorbis-0.22 )
+ xml? ( >=dev-libs/libxml2-2.6 )
+ xmp? ( >=media-libs/exempi-2.1 )
+ xps? ( app-text/libgxps )
+ !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ >=dev-util/gtk-doc-am-1.8
+ >=dev-util/intltool-0.40.0
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ gtk? ( >=dev-libs/libgee-0.3 )
+ test? (
+ >=dev-libs/dbus-glib-0.82-r1
+ >=sys-apps/dbus-1.3.1[X] )
+"
+PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
+
+# configure mixes enable-compile-warnings and with-compile-warnings
+# See upstream bug #705315
+QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
+
+function inotify_enabled() {
+ if linux_config_exists; then
+ if ! linux_chkconfig_present INOTIFY_USER; then
+ ewarn "You should enable the INOTIFY support in your kernel."
+ ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+ ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+ die 'missing CONFIG_INOTIFY'
+ fi
+ else
+ einfo "Could not check for INOTIFY support in your kernel."
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ inotify_enabled
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Don't run 'firefox --version' or 'thunderbird --version'; it results in
+ # access violations on some setups (bug #385347, #385495).
+ create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
+ create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+
+ # Skip broken tests
+ # https://bugzilla.gnome.org/show_bug.cgi?id=699408
+ sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
+ -i tests/libtracker-common/tracker-file-utils-test.c || die
+ # Fails inside portage, not outside
+ # https://bugzilla.gnome.org/show_bug.cgi?id=699413
+ sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
+ -i tests/tracker-steroids/tracker-test.c || die
+
+ eautoreconf # See bug #367975
+ gnome2_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+
+ if use gstreamer ; then
+ myconf="${myconf} --enable-generic-media-extractor=gstreamer"
+ if use upnp-av; then
+ myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
+ else
+ myconf="${myconf} --with-gstreamer-backend=discoverer"
+ fi
+ elif use ffmpeg ; then
+ myconf="${myconf} --enable-generic-media-extractor=libav"
+ else
+ myconf="${myconf} --enable-generic-media-extractor=external"
+ fi
+
+ # unicode-support: libunistring, libicu or glib ?
+ # According to NEWS, introspection is required
+ # is not being generated
+ # nautilus extension is in a separate package, nautilus-tracker-tags
+ gnome2_src_configure \
+ --disable-hal \
+ --disable-nautilus-extension \
+ --enable-abiword \
+ --enable-artwork \
+ --enable-dvi \
+ --enable-enca \
+ --enable-guarantee-metadata \
+ --enable-icon \
+ --enable-introspection \
+ --enable-libmediaart \
+ --enable-libpng \
+ --enable-miner-apps \
+ --enable-miner-user-guides \
+ --enable-ps \
+ --enable-text \
+ --enable-tracker-fts \
+ --enable-tracker-writeback \
+ --with-unicode-support=libicu \
+ $(use_enable cue libcue) \
+ $(use_enable eds miner-evolution) \
+ $(use_enable exif libexif) \
+ $(use_enable firefox-bookmarks miner-firefox) \
+ $(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
+ FIREFOX="${S}"/firefox-version.sh \
+ $(use_enable flac libflac) \
+ $(use_enable gif libgif) \
+ $(use_enable gsf libgsf) \
+ $(use_enable gtk tracker-needle) \
+ $(use_enable gtk tracker-preferences) \
+ $(use_enable iptc libiptcdata) \
+ $(use_enable iso libosinfo) \
+ $(use_enable jpeg libjpeg) \
+ $(use_enable upower upower) \
+ $(use_enable miner-fs) \
+ $(use_enable mp3 taglib) \
+ $(use_enable mp3) \
+ $(use_enable networkmanager network-manager) \
+ $(use_enable pdf poppler) \
+ $(use_enable playlist) \
+ $(use_enable rss miner-rss) \
+ $(use_enable test functional-tests) \
+ $(use_enable test unit-tests) \
+ $(use_enable thunderbird miner-thunderbird) \
+ $(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
+ THUNDERBIRD="${S}"/thunderbird-version.sh \
+ $(use_enable tiff libtiff) \
+ $(use_enable vorbis libvorbis) \
+ $(use_enable xml libxml2) \
+ $(use_enable xmp exempi) \
+ $(use_enable xps libgxps) \
+ ${myconf}
+}
+
+src_test() {
+ export G_MESSAGES_DEBUG=all # upstream bug #699401#c1
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ # Manually symlink extensions for {firefox,thunderbird}-bin
+ if use firefox-bookmarks; then
+ dosym /usr/share/xul-ext/trackerfox \
+ /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
+ fi
+
+ if use thunderbird; then
+ dosym /usr/share/xul-ext/trackerbird \
+ /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
+ fi
+}
+
+create_version_script() {
+ # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
+
+ local v=$(best_version ${1})
+ v=${v#${1}-}
+ local vbin=$(best_version ${1}-bin)
+ vbin=${vbin#${1}-bin-}
+
+ if [[ -z ${v} ]]; then
+ v=${vbin}
+ else
+ version_compare ${v} ${vbin}
+ [[ $? -eq 1 ]] && v=${vbin}
+ fi
+
+ echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
+ chmod +x "$3" || die
+}
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index f93c0bc17502..122e9b0264e7 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,3 +1,5 @@
DIST bash-completion-1.3.tar.bz2 211899 SHA256 8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec SHA512 f0c6eb3edce982d1306fdb7ba2cb598c08cff4bde8496fca369b3c4d2d3af0ef48dd494ab96258cc90f30b875a56759aad13a6b1bfb4928bfba4634cce6bf8be WHIRLPOOL 9ea16b019eadcdcf60046b58d2c0f3ab68c189f461842d3d9f585ff25d8ba1bd48bf847868c2cc7e5475320d9c7aeaf21ce74818345c7fe648500549d51f29f8
DIST bash-completion-2.1.tar.bz2 265329 SHA256 2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f SHA512 0bc71039ef136b1ccb72527eb40f2ed4068a58dc31b1ac1ee52a40e7c950ea4cfbb4f1bee2f0da6774e56062578fa3653096e6d306eea7f028dd55ff737e92fe WHIRLPOOL 0275d8ac99a0ac5b12637bf2b13561d656b239ba7c166071cb283a481df2fdd904ad1c18608ea35b9af4f0f4db3b034f833f0fd586a0096626d1b268bcd8fc00
+DIST bash-completion-2.1_p20141224.tar.xz 257964 SHA256 a76ffdbc9f49f48e290f0e6f3d46060d51c770f91e25b35b014bc16fec76f517 SHA512 94649aad8dbf0f170422605a5f36c5cab61e45ce402a92f89a6eba3bd5d2e976087b35cd0a9b6d4d29ba608cee3bb27b692088c884b766447ee9eafa99c2814a WHIRLPOOL 0ea12dfc8f432ffed598aee65c7080de570ebe9783415c7ebe4bd5d152fc645a132fae3a28986c029d13a4b939e15053204d73ae9b207f4ad62b9c117bf59cba
+DIST bashcomp-2.0.1.tar.bz2 4078 SHA256 142348b61b32fb3f1580ac90b684b1014d6d177f371baadb503340c507f9a992 SHA512 8ac8982f418a2d71dffcf027ffe0b7eefa3ee49413a726a8ee9e758975d8f86c687a64b55cd94e09b7936d1c6990285ddc90a3c2b1989af44322937c5c4fb8d7 WHIRLPOOL b6daa0a93282e9df73635cbdddde97c473fd22aa3baf035c3ffcb5966152e20b26d85979fe8a5ecf9128157422f3f60dc27c82c843b9a0e6e80b7de7da596250
DIST bashcomp2-pre1.tar.gz 3732 SHA256 fd201638bae06f134c243887cafe402ef0a21f9e62cca3966f405c249abc9eec SHA512 745801fe20c846cb0cdb044d712caacd75a2902c9dddc2261bdb179dcd826e5d1032d6b1f73340abe74dbb82d29b4386897291ccdf45d9bbd1fdb80a5f79fa45 WHIRLPOOL eb529c7263653b3e3e36c0cf29d44c57ce64bb2144f06ff7f2df569dd2ae66eb135b2ace5542c37cb100da8b3562b32ab61bcd9f5fd3cfbf67febf5e5086e04a
diff --git a/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild b/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild
new file mode 100644
index 000000000000..d82d9581c745
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild,v 1.1 2014/12/23 23:53:25 mgorny Exp $
+
+EAPI=5
+
+BASHCOMP_P=bashcomp-2.0.1
+inherit versionator
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="http://bash-completion.alioth.debian.org/"
+SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.xz
+ http://dev.gentoo.org/~mgorny/dist/${BASHCOMP_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+RDEPEND=">=app-shells/bash-4.3_p30-r1
+ sys-apps/miscfiles
+ !app-admin/eselect-bashcomp"
+DEPEND="app-arch/xz-utils"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+ # Slackware package stuff, quite generic names cause collisions
+ # (e.g. with sys-apps/pacman)
+ explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+ # Debian/Red Hat network stuff
+ ifdown ifup ifstatus
+
+ # Installed in app-editors/vim-core
+ xxd
+
+ # Now-dead symlinks to deprecated completions
+ hd ncal
+)
+
+src_prepare() {
+ epatch "${WORKDIR}/${BASHCOMP_P}/${P}"-*.patch
+}
+
+src_test() { :; } # Skip testsuite because of interactive shell wrt #477066
+
+src_install() {
+ # work-around race conditions, bug #526996
+ mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+ emake DESTDIR="${D}" profiledir=/etc/bash/bashrc.d install
+
+ local file
+ for file in "${STRIP_COMPLETIONS[@]}"; do
+ rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+ done
+ # remove deprecated completions (moved to other packages)
+ rm "${ED}"/usr/share/bash-completion/completions/_* || die
+
+ dodoc AUTHORS CHANGES README
+
+ # install the eselect module
+ insinto /usr/share/eselect/modules
+ doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+ doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+}
+
+pkg_postinst() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 2.1-r90 ${v}; then
+ ewarn "For bash-completion autoloader to work, all completions need to"
+ ewarn "be installed in /usr/share/bash-completion/completions. You may"
+ ewarn "need to rebuild packages that installed completions in the old"
+ ewarn "location. You can do this using:"
+ ewarn
+ ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+ ewarn
+ ewarn "After the rebuild, you should remove the old setup symlinks:"
+ ewarn
+ ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+ fi
+ done
+
+ if has_version 'app-shells/zsh'; then
+ elog
+ elog "If you are interested in using the provided bash completion functions with"
+ elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+ elog " http://www.zsh.org/mla/workers/2003/msg00046.html"
+ elog
+ fi
+}
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild
index 7a66a1dd0c01..e598c59b566a 100644
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -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/antiword/antiword-0.37-r1.ebuild,v 1.3 2014/12/23 09:03:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.37-r1.ebuild,v 1.5 2014/12/24 14:45:32 ago Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
src_prepare() {
# Makefile is a symlink to Makefile.Linux, avoid that we patch it by
diff --git a/dev-haskell/crypto-pubkey/Manifest b/dev-haskell/crypto-pubkey/Manifest
index dc0452aa6767..f2681c396650 100644
--- a/dev-haskell/crypto-pubkey/Manifest
+++ b/dev-haskell/crypto-pubkey/Manifest
@@ -3,3 +3,4 @@ DIST crypto-pubkey-0.2.1.tar.gz 39246 SHA256 dacbbb0766cc157b803880c67e51c406e5f
DIST crypto-pubkey-0.2.3.tar.gz 42280 SHA256 b38af600bd8bd748da673ffa7fa0914767dbdba79673561437776246bbba0fa5 SHA512 83fcebd59f15fd544502f91a0dbb9a166ff0b159d754288b003e478fffdf61580dfff77f637e47b14a2aff7921141cb3a1045d641a77b60d2beba6fd6152c08f WHIRLPOOL 92aadb2fcce601f2cd2cc998571058598d5c09a1573a1357b5a5fc5bf202fe99fcea073417ba8d3dc6c3731933af3233e44724e66edf28e15feb485a2b428232
DIST crypto-pubkey-0.2.4.tar.gz 42386 SHA256 04c2b49a9d82fc4ba2305a9f9dbfd1718de3f81277459cbec8070b55bfc9b255 SHA512 db2d9f7d7160b6cd94f9af94e4a84a74fad4552d27285d56a347fb338cb3a291fbc70796cbe565ebbbfe000d6020b4dab22283a9040756c8e372ae96b163a123 WHIRLPOOL 803cb84fd942a9690483fca166f7274c5652e2feafad10ad2565050fd14c7297e8f772b96e8fdb2a64bde95146bb81d741dfad410b01ee155f209b27691d7693
DIST crypto-pubkey-0.2.5.tar.gz 42619 SHA256 b8d301dbbc232c4d1b5f2cc946cc34d63ca1a4e1b78823b4251dddfeaaa93da3 SHA512 8a3eeb19e6082220fd001738192e97ffbd62f4d2a3c03180d833ccaca66df5c6b01bbf95e4968871205146fe5b64e1307df8d506cb877dd0b18aa988ae22e294 WHIRLPOOL be17f34c852ad837da1083f01494636dccfc216f586293592f40cbf737a11d8e35fe1e60a0de41cbbafd326061f7bf5bdbe456ce425585489037cd253e3b0364
+DIST crypto-pubkey-0.2.6.tar.gz 43049 SHA256 ff754de36002f55f4f482b54bdc97688d149da0140070102991515fb830192a7 SHA512 2859f658128b4294610c49495fdab3934fdaa036c4e9107afd28c154b0c4f64547064e17b7976ed0f9c46db0fe2695a85e208896cb073c64cccde1a185218067 WHIRLPOOL 17e0cdcde63d19ca3b06898cd29e63c27c269302dca986bfed1ab2c4589b4029eb456f268d23b761e7cee19e740b5deaa6ac05b0ba0e77b290425906d10b5b46
diff --git a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.6.ebuild b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.6.ebuild
new file mode 100644
index 000000000000..989c33dc8ded
--- /dev/null
+++ b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.6.ebuild,v 1.1 2014/12/24 03:32:13 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Public Key cryptography"
+HOMEPAGE="http://github.com/vincenthz/hs-crypto-pubkey"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/byteable:=[profile?]
+ >=dev-haskell/crypto-numbers-0.2.2:=[profile?]
+ >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] =dev-haskell/crypto-random-0.0:=[profile?] =dev-haskell/cryptohash-0.9.1:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( dev-haskell/hunit
+ >=dev-haskell/quickcheck-2
+ >=dev-haskell/test-framework-0.3.3
+ dev-haskell/test-framework-hunit
+ >=dev-haskell/test-framework-quickcheck2-0.2.9 )
+"
diff --git a/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild
index e88fe2d7f9a7..1df1a92457d0 100644
--- a/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild
+++ b/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild,v 1.1 2014/07/14 15:22:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.2.ebuild,v 1.2 2014/12/23 22:54:20 slyfox Exp $
EAPI=5
@@ -23,4 +23,4 @@ RDEPEND=">=dev-lang/ghc-7.0.1:=
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10.0.0
"
-CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.9.2014*"
+CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.8.3.20141119 7.8.4 7.9.2014*"
diff --git a/dev-haskell/hastache/Manifest b/dev-haskell/hastache/Manifest
index 255f45b01731..7abb2c222392 100644
--- a/dev-haskell/hastache/Manifest
+++ b/dev-haskell/hastache/Manifest
@@ -1,2 +1,3 @@
DIST hastache-0.5.1.tar.gz 12674 SHA256 c3f26caccaa67e3eb482b3c90c0f4817ae808001782a2459af0a06f6653d9516 SHA512 f7fe130ff047332d0db58b831f412ec398c8854f5401ff5de16493f503171e8735708c165bc090220f8db446a44389ec0715e6b4900994759093ff3e69e7a86a WHIRLPOOL fdbf5d8d685bbabca1427adaac842c9ed82a1ebf4a2e70078072b221d35d9be711885f068a97e7458494c50177889f92827f4ea4697e9a60f252b48cdd0a61a3
DIST hastache-0.6.0.tar.gz 13195 SHA256 b033a0dd3a38e0ef0772562bb1d5ed8f535c2fa6955633875ae520a6614dc0fc SHA512 e6c4630ad278f70cf382f8b7a06bc535868b9000bd114d2b99856324703a78825bbd935a2693262a9c3b5bfc67fbe7f45edf9d56c973deaca1355ea708f965b7 WHIRLPOOL a9fdae1a7fd16f50f239728921fb185ebf980f20149b0830f84713e37b279c6acf13cf91dde866d6150b9ce763b5c0c95c7e80ed4b6f3c513ef17983aa060459
+DIST hastache-0.6.1.tar.gz 16452 SHA256 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464 SHA512 3f7f7d0b97e88aca474b818c0e7b48187bfade855b6117dce50ed3e64b557586b1827272d46438a7e36990fb932d6503c982fa4fc6b2dbb33b463b14d39436b4 WHIRLPOOL cb04da4c92314c82e846b2f05a2deaf9910c06814e17d6ba39b61b0ee52ff42c0acf5b0966b75709580e44e3ad271632d7bd36a8f8ebc88879800cde17d228f5
diff --git a/dev-haskell/hastache/hastache-0.6.1.ebuild b/dev-haskell/hastache/hastache-0.6.1.ebuild
new file mode 100644
index 000000000000..b97854b75cdb
--- /dev/null
+++ b/dev-haskell/hastache/hastache-0.6.1.ebuild
@@ -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-haskell/hastache/hastache-0.6.1.ebuild,v 1.1 2014/12/24 03:30:39 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell implementation of Mustache templates"
+HOMEPAGE="http://github.com/lymar/hastache"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/blaze-builder:=[profile?]
+ dev-haskell/ieee754:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/syb:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/transformers:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( dev-haskell/hunit )
+"
diff --git a/dev-haskell/hpc/hpc-0.6.0.1.ebuild b/dev-haskell/hpc/hpc-0.6.0.1.ebuild
index 785830c2c08d..c358d613cc37 100644
--- a/dev-haskell/hpc/hpc-0.6.0.1.ebuild
+++ b/dev-haskell/hpc/hpc-0.6.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hpc/hpc-0.6.0.1.ebuild,v 1.2 2014/10/05 18:30:29 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hpc/hpc-0.6.0.1.ebuild,v 1.3 2014/12/23 22:53:56 slyfox Exp $
EAPI=5
@@ -23,4 +23,4 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
"
-CABAL_CORE_LIB_GHC_PV="7.8.2 7.8.3"
+CABAL_CORE_LIB_GHC_PV="7.8.2 7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/monadcatchio-transformers/Manifest b/dev-haskell/monadcatchio-transformers/Manifest
index d6d0fabb770b..eb178bd29f0e 100644
--- a/dev-haskell/monadcatchio-transformers/Manifest
+++ b/dev-haskell/monadcatchio-transformers/Manifest
@@ -2,3 +2,4 @@ DIST MonadCatchIO-transformers-0.3.0.0.tar.gz 3965 SHA256 8c1cf1c5df6d9e6fcaf0f3
DIST MonadCatchIO-transformers-0.3.1.0.tar.gz 4530 SHA256 b62beda19ba6bb407113e5ad7b6fa63bb77d24b83e8d09fd0a48a14995f7bae4 SHA512 38e7c69bec4ef9805137c67ca39680f2b75e22a44055b5e29ea458c8ce557c87caafb82e4788f422d8fae58ff5d58618d6916d7ac835821709478fa1f7df09d7 WHIRLPOOL 1653029b9c8085913b260e9c8b15efa4e05f2d9b5030d722c3426fc350641a4a744a58f35e86e382c2dd29ae933012076e50613b198e20ece3e9d975a4e4c54d
DIST MonadCatchIO-transformers-0.3.1.1.tar.gz 4531 SHA256 73161e4b260dd12d85d33706308b3f13360150d5ec15e19261f18f02fc4dd8cd SHA512 b68901d957f3ff63e88ca6b04edc050e38dfc2ea243f482fb7a09712f5f2ea0ca17d5edd327eee031cae94524d1a3404780ed04afdfbdd6411d38b1d2019eac2 WHIRLPOOL e1ca1d9b03555eb80e4b07fe44215707cf6ea467a26529be4c2826d3093b9a37f3c270fa9791a73299619758b2d040d9da5b9d6ff90ac876873646b455b160b7
DIST MonadCatchIO-transformers-0.3.1.2.tar.gz 4523 SHA256 2d44fd9b0f29d5d866b1e35501bbb2ac89394b2b23b634abce385c6f3e26ace4 SHA512 b4b95a18250da15f7c10215eb060db0c489d64a857de0ed352a45dc978301c128ee8048b72d132cd6e7ce97efa861cab059126a31450e703df408b4a94fbf8f6 WHIRLPOOL 4d2a3c5daf1bb696379d5dc0abd7e38c4618d113e4a26eeb00881378be78687dd93e453ac7fed9034e7efbfaecbaa77c737bad79dca62fbd0d6bbc7f466a089c
+DIST MonadCatchIO-transformers-0.3.1.3.tar.gz 4526 SHA256 10a49c32c22123e053377fe558d0c136c2b3746d15954d60f66f6bc80f0404bd SHA512 7794596851f59bcf3cc60e69bbad7c32f2f35fb4c9b1f53455e92d38503539b06dc50d4a9633ed3b6855bdfd0d69d41c37805c727025a81e9841d0819fea684c WHIRLPOOL 0f24dd5229f2db9610290bc6f6917ed21bd0abdfc9e5bedf5c54f9694a0f13a24d223fd26e01021436a8051a9c30002255bc5d39b2d2a9f6c5af106d90808f3e
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
new file mode 100644
index 000000000000..75fb458f9e30
--- /dev/null
+++ b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild,v 1.1 2014/12/24 03:33:15 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="MonadCatchIO-transformers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Monad-transformer compatible version of the Control.Exception module"
+HOMEPAGE="http://hackage.haskell.org/package/MonadCatchIO-transformers"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] =dev-haskell/monads-tf-0.1:=[profile?] =dev-haskell/transformers-0.2:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/persistent-sqlite/Manifest b/dev-haskell/persistent-sqlite/Manifest
index 72ab30894e75..641367e8ebf9 100644
--- a/dev-haskell/persistent-sqlite/Manifest
+++ b/dev-haskell/persistent-sqlite/Manifest
@@ -3,5 +3,5 @@ DIST persistent-sqlite-1.2.0.tar.gz 1285410 SHA256 9060f3363d981bde0b5e5bab99562
DIST persistent-sqlite-1.2.1.tar.gz 1285579 SHA256 c097a32e9d73a38143652b109db895180db2c621178ccedfa43df6718d466bd1 SHA512 10b0c2ee09998f12c35d35ac8a8e41ca9208e01033fab15af906d663f191f41ea474ed64a4adc57238d0c3d185381056067207df6ed40157c13898321a128669 WHIRLPOOL c6b2f03029b7bd2764e3291befc05f4c99e7c2b4e122af6d9f67217d221ab4d216bc3bb174ef4747e20b0cfad9c76ff136a7138f14b9671772ab38ae94078243
DIST persistent-sqlite-1.3.0.2.tar.gz 1352917 SHA256 f3cf2a977f5cf2113dc3c0d20c326e8e71c7e35f3c8176ae76f518a9f1aab657 SHA512 abc7d21e7d77a7bb037826bee747e5fc1a191c679d73c83881526dc84007bdec9b12f7f6c60b8f8edaef27d37db816a763f6a9c5180a3767d596e80b07af1ebc WHIRLPOOL 8c9b2004894ff3e8c6287afd108e22f53a14d37560a6d49e7576b37e26a432f29e3085817349e0c130b2e02b9569379b897a9fc5d4689773c4ecdbad608dc932
DIST persistent-sqlite-1.3.0.5.tar.gz 1353303 SHA256 eb477f7f98d4af69aa5ef88750c0e62915378c554a480652b4b09e4f985f6715 SHA512 5ea6919c73eb7d791bfdd09ed12bc8eba957cbc6854596d08bfe6b5e924929f2fa031fdffe69b755b29a8c99571a2e3ee784ab7abc4b983a279bb69735b0d3d0 WHIRLPOOL 8d427c9e7dd9a26cc25e6c979dcd11aee6b906992197ae26dc6ab593b77d1466e9de6b042b13533fb112ed82308862ba7774478e2e64bd3b113fbdbe8b8415fd
-DIST persistent-sqlite-2.1.1.1.tar.gz 1364160 SHA256 2a95017f380490732773752b4e59c359373f4ee3422a202b4b2e623499daf40a SHA512 bc894801446780864b1feec239fdeede567b9cf0b50f2289b6e12b9b3d5668bdc57f0a8f17ed180602a8dca9921af030320e23418ed9d0bf941e77e792c2f882 WHIRLPOOL 026cd6e0e5aba3efb6d08f473862ab706ab1416b231e17d3e3921423b607d792cb2df54d2c6729e8ac186198c3061eab4467aa4fb2ee8336845f83be6398ab84
+DIST persistent-sqlite-2.1.1.2.tar.gz 1364228 SHA256 0a4a8d10d5a15104dc1ad07c1e66802980316c7320e8fb8e3a916879f22bd74e SHA512 3d6b5b3963b2014fe3598c8398182cd83331b6b8d49003464d61c00ed3b8f681402df3096c82734866c067cfaa7eab49437e2cde4aede5ddf72eb0258932707d WHIRLPOOL 569534fd757d9ae8409cad5b4dade9aabcea3705191ff0e3d083e1371a8aeb32d5acadefb7f9d5fb85afe2fb78ea4d5cf7776fca8b5fe04750647631217c7563
DIST persistent-sqlite-2.1.1.tar.gz 1363430 SHA256 3c797eb43456d159c304b174554d91e9efc31d761dbcc5dd03019bcb7b54d7c3 SHA512 5a28597c340b4465e6cf717decc9f7ec579fe0523c2b9f0f69cd8755254c8621b5e00f4eb441da2acc5f1edebfb19b8325f3f246d9e2b747a71d962b1d3f3f9c WHIRLPOOL e821c86048eeefeba8548d79073715867a99fd081f45c34832a9d4857e0b07e351deecd32a9288e89c0a485af4dbb0319687b397597d8fdcdd36652b9e5f7e59
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.1.1.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.1.2.ebuild
similarity index 95%
rename from dev-haskell/persistent-sqlite/persistent-sqlite-2.1.1.1.ebuild
rename to dev-haskell/persistent-sqlite/persistent-sqlite-2.1.1.2.ebuild
index 78d273ec1443..c2a35fe77b84 100644
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.1.1.ebuild
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.1.1.ebuild,v 1.1 2014/12/22 11:00:00 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.1.2.ebuild,v 1.1 2014/12/24 03:45:33 gienah Exp $
EAPI=5
diff --git a/dev-haskell/persistent/Manifest b/dev-haskell/persistent/Manifest
index a545b6d83e4d..49b665f94652 100644
--- a/dev-haskell/persistent/Manifest
+++ b/dev-haskell/persistent/Manifest
@@ -2,5 +2,5 @@ DIST persistent-1.1.5.1.tar.gz 31484 SHA256 df3a2eaf2765797382672f26a4b48ea3fdbb
DIST persistent-1.2.3.0.tar.gz 31470 SHA256 759ce0fc3e0054776cb6882cb4df9c1c8347c4d48479e993af03da2c460a342e SHA512 80993fcfcfd9cd86992d5d7273bea9b8bd40d46d039e8725a035430c6202172e70f2012f6810488213df08b7093ec190bb8eee4ad34addcc3f0f8e325bbc46af WHIRLPOOL 46e7b6439df80bd51656ab528ac2d9e1445207cbf68191137801b0d1bcd88e92288ce72f37713bcd332f123a33ae5ca0ed6150eab6d189cf333a6b4ddd170077
DIST persistent-1.3.0.2.tar.gz 36582 SHA256 deeca88fafdf6a7c7c87635f8784831cfab25015371e52ffa2ff4a6c0d057899 SHA512 d59cc643f659186ce553bf6131df64b98f37cda6ae602d5b5856fa6adfbf95e6cdcc0d19cc72ba4c1dbaa26c881476399cc66b93153c7525d42d473d54898638 WHIRLPOOL 92a103fc8e4ff4c071105b27f6d89d229c343e9fa09daa69d1503a2c49a3ef824157aa3f15d8b79b2e69f8be08f101bc3116df82394a54d898cddc6cf82244a3
DIST persistent-1.3.1.1.tar.gz 37042 SHA256 7db789abfdd485f6f8a5f27613115f53f0d9702b87e1d200d91fa27a22ab4159 SHA512 b9c1fbd6578cad478c5af0d43b4378fd992a61fd3a7b3512cbb3207f560b53859788143de611c4add68b4ff1e69b472462bac2cd91c62fca4c1352fad07558c9 WHIRLPOOL d997157ffd17e9219f568942d791c1e80f6d20377dabe7b1cd41db263bdcb089c8bffa7e04fd95da2a07ecd364bee3811196adef41dee8993636c91d654fe52a
-DIST persistent-2.1.1.2.tar.gz 41430 SHA256 1cf1e83747f4a0393749f2bd4b580e68cbd99e90bfcdd11066648b6c48730571 SHA512 b5f872f1c8f812250122718d4af90b360034302fe613340727d68ba1fff143f709e0565d70ec67dd35ddec6fa56d5c2c220b5bca6a820f44f123f84d7826f23c WHIRLPOOL f0d71785db9fdb2cfbe6d2379774c7b82519f8c271401f8aa10df30c380146a6d0c6b9fb68ab906d44f6e74672f88ec2f9117e0d7acc07af1ec709db62dcc2a2
+DIST persistent-2.1.1.3.tar.gz 41593 SHA256 afbe0d26267dece6433bfa2ac6179c322b8b72c13eb4bb2c2964688ea74af79e SHA512 48ea224a27e2c74e6812f66d3a3be841a5f9db5ac7fd671e1f9d3b4f62b7753af431558cc8141b86fdedee36f350a697e38161a733f41a17fa3d54950ee34cf5 WHIRLPOOL 66b86fef7accd9a3e1cd411c3b4fe3a94c0dc68231b7e38e8107bf6fe8dcbdb16ba56c7d793644ca44e0bf0f6baf7ddfd51d91935210dc42aebf7fd3fb366011
DIST persistent-2.1.1.tar.gz 40445 SHA256 a1b52bd19203f09adc30d336a0898b0693a0a7de10415d708aa57ff07f94bb72 SHA512 1934e2eaf26532df9a61d1a8c4a25d6b169cb74cf580f8a76860adcf2fa3a46acec46d4bfa24d8f3795f287e340a6f4345f3cb58054c3cddbec50d65e93f637a WHIRLPOOL 8827a151da97060d32af0a48235e0f34345b13aaeba772dea7e67246a7836d45b87fab7a2214677fbc2dae38d73145d049c2e7dec9e2201d200c8302c70cda09
diff --git a/dev-haskell/persistent/persistent-2.1.1.2.ebuild b/dev-haskell/persistent/persistent-2.1.1.3.ebuild
similarity index 96%
rename from dev-haskell/persistent/persistent-2.1.1.2.ebuild
rename to dev-haskell/persistent/persistent-2.1.1.3.ebuild
index e23ac576c83a..36f63b88d188 100644
--- a/dev-haskell/persistent/persistent-2.1.1.2.ebuild
+++ b/dev-haskell/persistent/persistent-2.1.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/persistent/persistent-2.1.1.2.ebuild,v 1.1 2014/12/22 10:57:47 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/persistent/persistent-2.1.1.3.ebuild,v 1.1 2014/12/24 03:47:31 gienah Exp $
EAPI=5
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
index 8e4c35030bb6..bfbdc308aae7 100644
--- a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild,v 1.3 2014/08/11 15:07:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild,v 1.4 2014/12/23 22:53:13 slyfox Exp $
EAPI=5
@@ -25,4 +25,4 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10.0.0
"
-CABAL_CORE_LIB_GHC_PV="7.8.3"
+CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
index 7d0c93e7fdb1..2a227347bf52 100644
--- a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
+++ b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild,v 1.9 2014/08/21 10:05:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild,v 1.10 2014/12/23 22:52:43 slyfox Exp $
EAPI=5
@@ -22,4 +22,4 @@ RDEPEND=">=dev-lang/ghc-6.10.4:="
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
-CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3"
+CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
index e7cc9c59103f..b9bcb084beac 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild,v 1.8 2014/08/12 10:07:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild,v 1.9 2014/12/23 22:53:36 slyfox Exp $
EAPI=5
@@ -22,4 +22,4 @@ RDEPEND=">=dev-lang/ghc-6.10.4:="
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
-CABAL_CORE_LIB_GHC_PV="7.8.3"
+CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-lang/erlang/erlang-17.3.ebuild b/dev-lang/erlang/erlang-17.3.ebuild
index f94e7503394c..bdb528df9521 100644
--- a/dev-lang/erlang/erlang-17.3.ebuild
+++ b/dev-lang/erlang/erlang-17.3.ebuild
@@ -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-lang/erlang/erlang-17.3.ebuild,v 1.3 2014/12/23 09:03:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-17.3.ebuild,v 1.5 2014/12/24 14:45:09 ago Exp $
EAPI=4
WX_GTK_VER="2.8"
@@ -18,7 +18,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
LICENSE="ErlPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl systemd tk wxwidgets"
RDEPEND=">=dev-lang/perl-5.6.1
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index d57ba64cd018..fc023ef7c34d 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -12,6 +12,7 @@ DIST ghc-7.4.2-src.tar.bz2 25836446 SHA256 f2ee1289a33cc70539287129841acc7eaf161
DIST ghc-7.6.2-src.tar.bz2 110778081 SHA256 d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533 SHA512 2e6e54f509e564f3713ea15dfefb16a84a467f8044c692ad2647c05b641e1ccb4125b9b63bbf711be1054d7ef56612186d2b9cd88ba4127fe01eec225152e4cf WHIRLPOOL 78724187c0f7579c3f39f257620d3046711f20fe07c540b6b70cf1b0b87bb8476d2382835895b5770865faaac291de05be88e2708fd0c1956ad7bc132d558b9c
DIST ghc-7.6.3-src.tar.bz2 110763823 SHA256 bd43823d31f6b5d0b2ca7b74151a8f98336ab0800be85f45bb591c9c26aac998 SHA512 ac86f18b4feeb0bdc9e867261600b210caf62740d73ae657259bbe8149b8c2c4f5a73d09d74d944d4e50f85cc87503485365f0a0ae65befe8d2b6844e5e1253a WHIRLPOOL 0fe1f5f2987699067494559e6a679d28f027eee8fb2a00c683161dbce5443b1faeebfb51572209b75231cee24c7f0c929cabbc82a93f70e16d05e351fdfe2eaf
DIST ghc-7.8.3-src.tar.xz 9160092 SHA256 b0cd96a549ba3b5e512847a4a8cd1a3174e4b2b75dadfc41c568fb812887b958 SHA512 2cc8c2aa6f18ba565c1e2aa637045e246f1214c2a77e95c2a97dfb97203b8983e4ad3cc13178b4b51aff70c58d59a1f68f94cd813d043745cb02411bad04bb00 WHIRLPOOL 3a2e8eea0db7a150e4732efed488a3a5eb56da00a9a90a3379afcb4090323925a2a7485fec6676e784139f112d7c825e8d18a576c34c760af4a7f3adb22c021a
+DIST ghc-7.8.4-src.tar.bz2 10600755 SHA256 59e3bd514a1820cc1c03e1808282205c0b8518369acae12645ceaf839e6f114b SHA512 079a53891d8ebd8d9b88da96170e60981608a619f8282e4b7948f35244e99bd87277649ac7fcebc227a61a4d21960db8d5e5b9e92f2c69c82d8d68d7fd0a41d3 WHIRLPOOL a9be7641adbd237ed6e0f644c312e655e98be9566097aee5e2c0022e8756d5b2236e42dd86d76c638a001b5ca3f67307e89ec0cd003a92cd112a5d6d3e3d8467
DIST ghc-bin-6.12.3-alpha-haddock.tbz2 106307940 SHA256 22951ccbaa2e77f811c634fa95492451f28f8b79e5cfe0297890ce1dd9d525ab SHA512 47b124cb2b745ffa6471dd75b9b922170cd275d837093f320116a842cc2ed4e6f215128fe7269bbe5f85b34239fe46bac697d7210c2f5df97b67c5629ea30c94 WHIRLPOOL 2f26c8c046e779ed63f86fdfcf2cb4815f5f0ea08b0c6c98668909a7a3bcca3c6fa2dac390d3bd066e197093227086cbe4bd5c35044a23d344e591b5d5a1cfc1
DIST ghc-bin-6.12.3-amd64.tbz2 82390661 SHA256 6a1c9978c4ad19bb98f70b900afa799f16cfd3e159bb6d51437c264e35f4d6cc SHA512 ae883f94621fcf0ffe8b57954e403db6812769bbeee92e031be49fc9cc2087c7700bb6a36c6fdd170936c2fea9024d2400db04db94c530841ab6662be34227e8 WHIRLPOOL ffbb50018216af9cc84d2cc04a39646dd47f70e1451bbaf700495864edddbbf729c61c3a020dde472e27236b19151b3373fd1b1735da5d3d9f68c63d9e3ea4ed
DIST ghc-bin-6.12.3-ia64-haddock.tbz2 113756002 SHA256 135c60f870badec5e10add87061d0d9c85276e182ae448ab52c6f9f7ebe6eb2e SHA512 0e789ff5af719106e9eac030c477109a928f04facfd9b7da0c55a25465cd5c92c409d08838f75206939943df6c028e302854da368eefe17fd704c88bc5e83fe4 WHIRLPOOL 7e6ad1b44f28724c4cbf8c618aa04202e61dddaf2f50a71de42161d32b78573fc530aeffb1cb4b550e2141690515487fd99e8c5e01d5c79775ffb771ee5cefe9
@@ -54,3 +55,5 @@ DIST ghc-bin-7.6.3-r1-sparc.tbz2 121641337 SHA256 0fb31b9584c1c6caafb44a51158bfd
DIST ghc-bin-7.6.3-x86.tbz2 93718672 SHA256 a55024f66a048437fcd6ef0f33cdb994a43628998a2f0fe4d094cc9ba83d1615 SHA512 624f2a3238dee15853018d45632d1363e42d34099a77e5e9ce5c8da976cb4c33578144f7c39dbf25ee68c17d8d42910db2347186849eeeda6bc20053ce2be990 WHIRLPOOL bc646fc19906b59416358fb7558b6e2c3f7ad069c2fcf443be36b621894cfcecb0844acf5b5f9c383e034dfff3e24d312a7da0d7a629836134ec5dc1ecd6f139
DIST ghc-bin-7.8.3-amd64.tbz2 100786052 SHA256 af49f547336a4f9f13cd625155d5a6a998e52ae7da8bbbddc856f88b00b6aff4 SHA512 b1826095b67fa2028678057f70909bff4e082b82f3b70f1aedbc91073efad54334fa1864bc8248c9249eec6edab3671dc38ac1650be86f1245e2fecf92528952 WHIRLPOOL 5b44fff77a0d79c6f7c5c8ca792eb6b36987d1de58d5ebc0a9b05da9c19a2c312eca6b9d40e7e63437742b7f9c28c925feb3bea7f9803dda95fac7acaa7a3132
DIST ghc-bin-7.8.3-x86.tbz2 102583755 SHA256 c67f0d2471e594b4fdfc5b219bb6b61e57e6ba75132aa3f63d171550af8cbe3c SHA512 badabbba2f46b5ab3a2601e53997ce6533162afeec7dc36eeb877a62680a9f599aeb05dd3682f45d3e273d71d28b8bd01eee37dcad3c7354e8f83b7be4e58536 WHIRLPOOL 7b99b6bbeb4ad6d203f270d8446285825ad0857a8ab058d8c126155b49e8819e0efc2f6c42b5ff775dc0ece5488e97fcc7ae2459fe87fdceef43d63a75443430
+DIST ghc-bin-7.8.4-amd64.tbz2 100573133 SHA256 bd9d144c08caa0ff345ada8d7eed7592531b8f8b9ef2f94d0b9a42fd747440aa SHA512 e4416d6dae3c644f74bafb3aecf1a123f985427aba32d0e0c43143a137d64a9220fc5947cd9bde8a3bc44555ae71184fc06a3f7df7976aadd065ad5681b90954 WHIRLPOOL ab0bd6219d68e08cb473cf2f3f15538d65940f28e84f026361032c3a6bc09f7820faf67629e915f27c2afda7de41fa9c6010a1b5cd487df0936d968c7e58a3a4
+DIST ghc-bin-7.8.4-x86.tbz2 102312459 SHA256 4c53148836e5a1ba55b8db5bb7c3eb915103e0955fb503b2facdc5a72f12a974 SHA512 cabc5bd6d8760ce4120e7053f6c1dffca7d161ba454b6201087760096c037c932e3ff8c82e53346c8278855bf0cff1c2f5fb8046242ca4d8307355b060a9556e WHIRLPOOL 0171d67dc1b63381a491e1577a783eb0e8f53cb579ba96a9b4fdf6685d494d78eb2be780f77ff33422d3b7c320ed102d9b48f6e954f8fee5532982575001a4a5
diff --git a/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch b/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch
new file mode 100644
index 000000000000..434be8b1bdad
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch
@@ -0,0 +1,351 @@
+commit fa31e8f4a0f853848d96549a429083941877bf8d
+Author: Sergei Trofimovich
+Date: Sun Dec 14 14:30:12 2014 +0000
+
+ powerpc: fix and enable shared libraries by default on linux
+
+ Summary:
+ And fix things all the way down to it. Namely:
+ - remove 'r30' from free registers, it's an .LCTOC1 register
+ for gcc. generated .plt stubs expect it to be initialised.
+ - fix PicBase computation, which originally forgot to use 'tmp'
+ reg in 'initializePicBase_ppc.fetchPC'
+ - mark 'ForeighTarget's as implicitly using 'PicBase' register
+ (see comment for details)
+ - add 64-bit MO_Sub and test on alloclimit3/4 regtests
+ - fix dynamic label offsets to match with .LCTOC1 offset
+
+ Signed-off-by: Sergei Trofimovich
+
+ Test Plan: validate passes equal amount of vanilla/dyn tests
+
+ Reviewers: simonmar, erikd, austin
+
+ Reviewed By: erikd, austin
+
+ Subscribers: carter, thomie
+
+ Differential Revision: https://phabricator.haskell.org/D560
+
+ GHC Trac Issues: #8024, #9831
+
+diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
+index 0f2c0ae..37b8ada 100644
+--- a/compiler/cmm/CLabel.hs
++++ b/compiler/cmm/CLabel.hs
+@@ -1170,7 +1170,8 @@ pprDynamicLinkerAsmLabel platform dllInfo lbl
+ else if osElfTarget (platformOS platform)
+ then if platformArch platform == ArchPPC
+ then case dllInfo of
+- CodeStub -> ppr lbl <> text "@plt"
++ CodeStub -> -- See Note [.LCTOC1 in PPC PIC code]
++ ppr lbl <> text "+32768@plt"
+ SymbolPtr -> text ".LC_" <> ppr lbl
+ _ -> panic "pprDynamicLinkerAsmLabel"
+ else if platformArch platform == ArchX86_64
+diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs
+index 9b5c080..6326a8b 100644
+--- a/compiler/nativeGen/PIC.hs
++++ b/compiler/nativeGen/PIC.hs
+@@ -54,7 +54,6 @@ import qualified X86.Instr as X86
+
+ import Platform
+ import Instruction
+-import Size
+ import Reg
+ import NCGMonad
+
+@@ -468,11 +467,8 @@ pprGotDeclaration dflags ArchX86 OSDarwin
+ pprGotDeclaration _ _ OSDarwin
+ = empty
+
+--- pprGotDeclaration
++-- Emit GOT declaration
+ -- Output whatever needs to be output once per .s file.
+--- The .LCTOC1 label is defined to point 32768 bytes into the table,
+--- to make the most of the PPC's 16-bit displacements.
+--- Only needed for PIC.
+ pprGotDeclaration dflags arch os
+ | osElfTarget os
+ , arch /= ArchPPC_64
+@@ -482,6 +478,7 @@ pprGotDeclaration dflags arch os
+ | osElfTarget os
+ , arch /= ArchPPC_64
+ = vcat [
++ -- See Note [.LCTOC1 in PPC PIC code]
+ ptext (sLit ".section \".got2\",\"aw\""),
+ ptext (sLit ".LCTOC1 = .+32768") ]
+
+@@ -688,12 +685,7 @@ pprImportedSymbol _ _ _
+
+
+ -- Get a pointer to our own fake GOT, which is defined on a per-module basis.
+--- This is exactly how GCC does it, and it's quite horrible:
+--- We first fetch the address of a local label (mkPicBaseLabel).
+--- Then we add a 16-bit offset to that to get the address of a .long that we
+--- define in .text space right next to the proc. This .long literal contains
+--- the (32-bit) offset from our local label to our global offset table
+--- (.LCTOC1 aka gotOffLabel).
++-- This is exactly how GCC does it in linux.
+
+ initializePicBase_ppc
+ :: Arch -> OS -> Reg
+@@ -704,18 +696,9 @@ initializePicBase_ppc ArchPPC os picReg
+ (CmmProc info lab live (ListGraph blocks) : statics)
+ | osElfTarget os
+ = do
+- dflags <- getDynFlags
+- gotOffLabel <- getNewLabelNat
+- tmp <- getNewRegNat $ intSize (wordWidth dflags)
+ let
+- gotOffset = CmmData Text $ Statics gotOffLabel [
+- CmmStaticLit (CmmLabelDiffOff gotLabel
+- mkPicBaseLabel
+- 0)
+- ]
+- offsetToOffset
+- = PPC.ImmConstantDiff
+- (PPC.ImmCLbl gotOffLabel)
++ gotOffset = PPC.ImmConstantDiff
++ (PPC.ImmCLbl gotLabel)
+ (PPC.ImmCLbl mkPicBaseLabel)
+
+ blocks' = case blocks of
+@@ -726,15 +709,23 @@ initializePicBase_ppc ArchPPC os picReg
+ | bID `mapMember` info = fetchPC b
+ | otherwise = b
+
++ -- GCC does PIC prologs thusly:
++ -- bcl 20,31,.L1
++ -- .L1:
++ -- mflr 30
++ -- addis 30,30,.LCTOC1-.L1@ha
++ -- addi 30,30,.LCTOC1-.L1@l
++ -- TODO: below we use it over temporary register,
++ -- it can and should be optimised by picking
++ -- correct PIC reg.
+ fetchPC (BasicBlock bID insns) =
+ BasicBlock bID (PPC.FETCHPC picReg
+- : PPC.ADDIS tmp picReg (PPC.HI offsetToOffset)
+- : PPC.LD PPC.archWordSize tmp
+- (PPC.AddrRegImm tmp (PPC.LO offsetToOffset))
+- : PPC.ADD picReg picReg (PPC.RIReg picReg)
++ : PPC.ADDIS picReg picReg (PPC.HA gotOffset)
++ : PPC.ADDI picReg picReg (PPC.LO gotOffset)
++ : PPC.MR PPC.r30 picReg
+ : insns)
+
+- return (CmmProc info lab live (ListGraph blocks') : gotOffset : statics)
++ return (CmmProc info lab live (ListGraph blocks') : statics)
+
+
+ initializePicBase_ppc ArchPPC OSDarwin picReg
+diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs
+index ddf483a..c1c4a74 100644
+--- a/compiler/nativeGen/PPC/CodeGen.hs
++++ b/compiler/nativeGen/PPC/CodeGen.hs
+@@ -54,7 +54,7 @@ import Outputable
+ import Unique
+ import DynFlags
+
+-import Control.Monad ( mapAndUnzipM )
++import Control.Monad ( mapAndUnzipM, when )
+ import Data.Bits
+ import Data.Word
+
+@@ -355,6 +355,19 @@ iselExpr64 (CmmMachOp (MO_Add _) [e1,e2]) = do
+ ADDE rhi r1hi r2hi ]
+ return (ChildCode64 code rlo)
+
++iselExpr64 (CmmMachOp (MO_Sub _) [e1,e2]) = do
++ ChildCode64 code1 r1lo <- iselExpr64 e1
++ ChildCode64 code2 r2lo <- iselExpr64 e2
++ (rlo,rhi) <- getNewRegPairNat II32
++ let
++ r1hi = getHiVRegFromLo r1lo
++ r2hi = getHiVRegFromLo r2lo
++ code = code1 `appOL`
++ code2 `appOL`
++ toOL [ SUBFC rlo r2lo r1lo,
++ SUBFE rhi r2hi r1hi ]
++ return (ChildCode64 code rlo)
++
+ iselExpr64 (CmmMachOp (MO_UU_Conv W32 W64) [expr]) = do
+ (expr_reg,expr_code) <- getSomeReg expr
+ (rlo, rhi) <- getNewRegPairNat II32
+@@ -918,8 +931,12 @@ genCCall' dflags gcp target dest_regs args0
+ (toOL []) []
+
+ (labelOrExpr, reduceToFF32) <- case target of
+- ForeignTarget (CmmLit (CmmLabel lbl)) _ -> return (Left lbl, False)
+- ForeignTarget expr _ -> return (Right expr, False)
++ ForeignTarget (CmmLit (CmmLabel lbl)) _ -> do
++ uses_pic_base_implicitly
++ return (Left lbl, False)
++ ForeignTarget expr _ -> do
++ uses_pic_base_implicitly
++ return (Right expr, False)
+ PrimTarget mop -> outOfLineMachOp mop
+
+ let codeBefore = move_sp_down finalStack `appOL` passArgumentsCode
+@@ -940,6 +957,13 @@ genCCall' dflags gcp target dest_regs args0
+ where
+ platform = targetPlatform dflags
+
++ uses_pic_base_implicitly = do
++ -- See Note [implicit register in PPC PIC code]
++ -- on why we claim to use PIC register here
++ when (gopt Opt_PIC dflags) $ do
++ _ <- getPicBaseNat archWordSize
++ return ()
++
+ initialStackOffset = case gcp of
+ GCPDarwin -> 24
+ GCPLinux -> 8
+@@ -1431,3 +1455,21 @@ coerceFP2Int _ toRep x = do
+ -- read low word of value (high word is undefined)
+ LD II32 dst (spRel dflags 3)]
+ return (Any (intSize toRep) code')
++
++-- Note [.LCTOC1 in PPC PIC code]
++-- The .LCTOC1 label is defined to point 32768 bytes into the GOT table
++-- to make the most of the PPC's 16-bit displacements.
++-- As 16-bit signed offset is used (usually via addi/lwz instructions)
++-- first element will have '-32768' offset against .LCTOC1.
++
++-- Note [implicit register in PPC PIC code]
++-- PPC generates calls by labels in assembly
++-- in form of:
++-- bl puts+32768@plt
++-- in this form it's not seen directly (by GHC NCG)
++-- that r30 (PicBaseReg) is used,
++-- but r30 is a required part of PLT code setup:
++-- puts+32768@plt:
++-- lwz r11,-30484(r30) ; offset in .LCTOC1
++-- mtctr r11
++-- bctr
+diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs
+index f5b9506..b7081f9 100644
+--- a/compiler/nativeGen/PPC/Instr.hs
++++ b/compiler/nativeGen/PPC/Instr.hs
+@@ -205,8 +205,11 @@ data Instr
+ | ADD Reg Reg RI -- dst, src1, src2
+ | ADDC Reg Reg Reg -- (carrying) dst, src1, src2
+ | ADDE Reg Reg Reg -- (extend) dst, src1, src2
++ | ADDI Reg Reg Imm -- Add Immediate dst, src1, src2
+ | ADDIS Reg Reg Imm -- Add Immediate Shifted dst, src1, src2
+ | SUBF Reg Reg Reg -- dst, src1, src2 ; dst = src2 - src1
++ | SUBFC Reg Reg Reg -- (carrying) dst, src1, src2 ; dst = src2 - src1
++ | SUBFE Reg Reg Reg -- (extend) dst, src1, src2 ; dst = src2 - src1
+ | MULLW Reg Reg RI
+ | DIVW Reg Reg Reg
+ | DIVWU Reg Reg Reg
+@@ -284,8 +287,11 @@ ppc_regUsageOfInstr platform instr
+ ADD reg1 reg2 ri -> usage (reg2 : regRI ri, [reg1])
+ ADDC reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1])
+ ADDE reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1])
++ ADDI reg1 reg2 _ -> usage ([reg2], [reg1])
+ ADDIS reg1 reg2 _ -> usage ([reg2], [reg1])
+ SUBF reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1])
++ SUBFC reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1])
++ SUBFE reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1])
+ MULLW reg1 reg2 ri -> usage (reg2 : regRI ri, [reg1])
+ DIVW reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1])
+ DIVWU reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1])
+@@ -358,8 +364,11 @@ ppc_patchRegsOfInstr instr env
+ ADD reg1 reg2 ri -> ADD (env reg1) (env reg2) (fixRI ri)
+ ADDC reg1 reg2 reg3 -> ADDC (env reg1) (env reg2) (env reg3)
+ ADDE reg1 reg2 reg3 -> ADDE (env reg1) (env reg2) (env reg3)
++ ADDI reg1 reg2 imm -> ADDI (env reg1) (env reg2) imm
+ ADDIS reg1 reg2 imm -> ADDIS (env reg1) (env reg2) imm
+ SUBF reg1 reg2 reg3 -> SUBF (env reg1) (env reg2) (env reg3)
++ SUBFC reg1 reg2 reg3 -> SUBFC (env reg1) (env reg2) (env reg3)
++ SUBFE reg1 reg2 reg3 -> SUBFE (env reg1) (env reg2) (env reg3)
+ MULLW reg1 reg2 ri -> MULLW (env reg1) (env reg2) (fixRI ri)
+ DIVW reg1 reg2 reg3 -> DIVW (env reg1) (env reg2) (env reg3)
+ DIVWU reg1 reg2 reg3 -> DIVWU (env reg1) (env reg2) (env reg3)
+diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs
+index 6851769..f59d51f 100644
+--- a/compiler/nativeGen/PPC/Ppr.hs
++++ b/compiler/nativeGen/PPC/Ppr.hs
+@@ -525,6 +525,16 @@ pprInstr (BCTRL _) = hcat [
+ ptext (sLit "bctrl")
+ ]
+ pprInstr (ADD reg1 reg2 ri) = pprLogic (sLit "add") reg1 reg2 ri
++pprInstr (ADDI reg1 reg2 imm) = hcat [
++ char '\t',
++ ptext (sLit "addi"),
++ char '\t',
++ pprReg reg1,
++ ptext (sLit ", "),
++ pprReg reg2,
++ ptext (sLit ", "),
++ pprImm imm
++ ]
+ pprInstr (ADDIS reg1 reg2 imm) = hcat [
+ char '\t',
+ ptext (sLit "addis"),
+@@ -539,6 +549,8 @@ pprInstr (ADDIS reg1 reg2 imm) = hcat [
+ pprInstr (ADDC reg1 reg2 reg3) = pprLogic (sLit "addc") reg1 reg2 (RIReg reg3)
+ pprInstr (ADDE reg1 reg2 reg3) = pprLogic (sLit "adde") reg1 reg2 (RIReg reg3)
+ pprInstr (SUBF reg1 reg2 reg3) = pprLogic (sLit "subf") reg1 reg2 (RIReg reg3)
++pprInstr (SUBFC reg1 reg2 reg3) = pprLogic (sLit "subfc") reg1 reg2 (RIReg reg3)
++pprInstr (SUBFE reg1 reg2 reg3) = pprLogic (sLit "subfe") reg1 reg2 (RIReg reg3)
+ pprInstr (MULLW reg1 reg2 ri@(RIReg _)) = pprLogic (sLit "mullw") reg1 reg2 ri
+ pprInstr (MULLW reg1 reg2 ri@(RIImm _)) = pprLogic (sLit "mull") reg1 reg2 ri
+ pprInstr (DIVW reg1 reg2 reg3) = pprLogic (sLit "divw") reg1 reg2 (RIReg reg3)
+diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs
+index 0f636bf..69e69c0 100644
+--- a/compiler/nativeGen/PPC/Regs.hs
++++ b/compiler/nativeGen/PPC/Regs.hs
+@@ -37,7 +37,8 @@ module PPC.Regs (
+ fits16Bits,
+ makeImmediate,
+ fReg,
+- sp, r3, r4, r27, r28, f1, f20, f21,
++ sp, r3, r4, r27, r28, r30,
++ f1, f20, f21,
+
+ allocatableRegs
+
+@@ -295,12 +296,13 @@ point registers.
+ fReg :: Int -> RegNo
+ fReg x = (32 + x)
+
+-sp, r3, r4, r27, r28, f1, f20, f21 :: Reg
++sp, r3, r4, r27, r28, r30, f1, f20, f21 :: Reg
+ sp = regSingle 1
+ r3 = regSingle 3
+ r4 = regSingle 4
+ r27 = regSingle 27
+ r28 = regSingle 28
++r30 = regSingle 30
+ f1 = regSingle $ fReg 1
+ f20 = regSingle $ fReg 20
+ f21 = regSingle $ fReg 21
+diff --git a/includes/CodeGen.Platform.hs b/includes/CodeGen.Platform.hs
+index 9916e0e..1d46a01 100644
+--- a/includes/CodeGen.Platform.hs
++++ b/includes/CodeGen.Platform.hs
+@@ -881,6 +881,8 @@ freeReg 1 = fastBool False -- The Stack Pointer
+ # if !MACHREGS_darwin
+ -- most non-darwin powerpc OSes use r2 as a TOC pointer or something like that
+ freeReg 2 = fastBool False
++-- at least linux in -fPIC relies on r30 in PLT stubs
++freeReg 30 = fastBool False
+ # endif
+ # ifdef REG_Base
+ freeReg REG_Base = fastBool False
+diff --git a/mk/config.mk.in b/mk/config.mk.in
+index 0f5820f..8f134bc 100644
+--- a/mk/config.mk.in
++++ b/mk/config.mk.in
+@@ -95,7 +95,7 @@ TargetElf = YES
+ endif
+
+ # Some platforms don't support shared libraries
+-NoSharedLibsPlatformList = powerpc-unknown-linux \
++NoSharedLibsPlatformList = \
+ x86_64-unknown-mingw32 \
+ i386-unknown-mingw32
+
diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild
new file mode 100644
index 000000000000..14660b52b6e7
--- /dev/null
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.4.ebuild,v 1.1 2014/12/23 22:46:09 slyfox Exp $
+
+EAPI=5
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+#
+# 'CTARGET' definition and 'is_crosscompile' are taken from 'toolchain.eclass'
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+ export CTARGET=${CATEGORY/cross-}
+ fi
+fi
+
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib pax-utils toolchain-funcs versionator
+
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
+#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+ case "${ARCH}" in
+ #alpha) return 0 ;;
+ #arm)
+ # ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
+ # return 0
+ #;;
+ amd64) return 0 ;;
+ #ia64) return 0 ;;
+ #ppc) return 0 ;;
+ #ppc64) return 0 ;;
+ #sparc) return 0 ;;
+ x86) return 0 ;;
+ *) return 1 ;;
+ esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=7.8.3.20141119 # uncomment only for -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? ( http://downloads.haskell.org/~ghc/${PV/_rc/-rc}/${GHC_P}-src.tar.bz2 )"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc ghcbootstrap ghcmakebinary +gmp"
+IUSE+=" binary"
+IUSE+=" elibc_glibc" # system stuff
+
+RDEPEND="
+ >=dev-lang/perl-5.6.1
+ >=dev-libs/gmp-5:=
+ sys-libs/ncurses:=[unicode]
+ !ghcmakebinary? ( virtual/libffi:= )
+ !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 )
+ kernel_linux? ( >=sys-devel/binutils-2.17 )
+ kernel_SunOS? ( >=sys-devel/binutils-2.17 )
+"
+
+# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to
+# that we want the binaries to use the latest versioun available, and not to be
+# built against gmp-4
+
+# similar for glibc. we have bootstrapped binaries against glibc-2.17
+DEPEND="${RDEPEND}
+ ghcbootstrap? ( >=dev-haskell/alex-2.3
+ >=dev-haskell/happy-1.18
+ doc? ( app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ >=dev-libs/libxslt-1.1.2 ) )
+ !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )"
+
+PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
+
+REQUIRED_USE="?? ( ghcbootstrap binary )"
+
+# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
+use binary && QA_PREBUILT="*"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+append-ghc-cflags() {
+ local persistent compile assemble link
+ local flag ghcflag
+
+ for flag in $*; do
+ case ${flag} in
+ persistent) persistent="yes";;
+ compile) compile="yes";;
+ assemble) assemble="yes";;
+ link) link="yes";;
+ *)
+ [[ ${compile} ]] && ghcflag="-optc${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+ [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+ [[ ${assemble} ]] && ghcflag="-opta${flag}" CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+ [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+ [[ ${link} ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+ [[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+ ;;
+ esac
+ done
+}
+
+ghc_setup_cflags() {
+ if is_crosscompile; then
+ export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+ export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+ einfo "Crosscompiling mode:"
+ einfo " CHOST: ${CHOST}"
+ einfo " CTARGET: ${CTARGET}"
+ einfo " CFLAGS: ${CFLAGS}"
+ einfo " LDFLAGS: ${LDFLAGS}"
+ return
+ fi
+ # We need to be very careful with the CFLAGS we ask ghc to pass through to
+ # gcc. There are plenty of flags which will make gcc produce output that
+ # breaks ghc in various ways. The main ones we want to pass through are
+ # -mcpu / -march flags. These are important for arches like alpha & sparc.
+ # We also use these CFLAGS for building the C parts of ghc, ie the rts.
+ strip-flags
+ strip-unsupported-flags
+
+ # Cmm can't parse line numbers #482086
+ replace-flags -ggdb[3-9] -ggdb2
+
+ GHC_FLAGS=""
+ GHC_PERSISTENT_FLAGS=""
+ for flag in ${CFLAGS}; do
+ case ${flag} in
+
+ # Ignore extra optimisation (ghc passes -O to gcc anyway)
+ # -O2 and above break on too many systems
+ -O*) ;;
+
+ # Arch and ABI flags are what we're really after
+ -m*) append-ghc-cflags compile assemble ${flag};;
+
+ # Sometimes it's handy to see backtrace of RTS
+ # to get an idea what happens there
+ -g*) append-ghc-cflags compile ${flag};;
+
+ # Ignore all other flags, including all -f* flags
+ esac
+ done
+
+ for flag in ${LDFLAGS}; do
+ append-ghc-cflags link ${flag}
+ done
+
+ # hardened-gcc needs to be disabled, because the mangler doesn't accept
+ # its output.
+ gcc-specs-pie && append-ghc-cflags persistent compile link -nopie
+ gcc-specs-ssp && append-ghc-cflags persistent compile -fno-stack-protector
+
+ # prevent from failind building unregisterised ghc:
+ # http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+ use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+ # fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data
+ # currently ghc fails to build haddock
+ # http://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html
+ use ia64 && append-ghc-cflags persistent compile -G0 -Os
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+ local from=$1
+ local to=$2
+ shift 2
+ local file=
+ for file in "$@"
+ do
+ sed -i -e "s|$from|$to|g" \
+ "$file" || die "path relocation failed for '$file'"
+ done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+ local to=$1
+
+ # libdir for prebuilt binary and for current system may mismatch
+ # It does for prefix installation for example: bug #476998
+ local bin_ghc_prefix=${WORKDIR}/usr
+ local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+ local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+ # backup original script to use it later after relocation
+ local gp_back="${T}/ghc-pkg-${GHC_PV}-orig"
+ cp "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+ if [[ ${bin_libdir} != $(get_libdir) ]]; then
+ einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+ # moving the dir itself is not strictly needed
+ # but then USE=binary would result in installing
+ # in '${bin_libdir}'
+ mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+ relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+ "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/hsc2hs" \
+ "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
+ "$gp_back" \
+ "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
+ fi
+
+ # Relocate from /usr to ${EPREFIX}/usr
+ relocate_path "/usr" "${to}/usr" \
+ "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/hsc2hs" \
+ "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
+ "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/package.conf.d/"*
+
+ # this one we will use to regenerate cache
+ # so it should point to current tree location
+ relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+ if use prefix; then
+ # and insert LD_LIBRARY_PATH entry to EPREFIX dir tree
+ # TODO: add the same for darwin's CHOST and it's DYLD_
+ local new_ldpath='LD_LIBRARY_PATH="'${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)'${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"\nexport LD_LIBRARY_PATH'
+ sed -i -e '2i'"$new_ldpath" \
+ "${WORKDIR}/usr/bin/ghc-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/ghci-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/ghc-pkg-${GHC_PV}" \
+ "${WORKDIR}/usr/bin/hsc2hs" \
+ "${WORKDIR}/usr/bin/runghc-${GHC_PV}" \
+ "$gp_back" \
+ "${WORKDIR}/usr/bin/hsc2hs" \
+ || die "Adding LD_LIBRARY_PATH for wrappers failed"
+ fi
+
+ # regenerate the binary package cache
+ "$gp_back" recache || die "failed to update cache after relocation"
+ rm "$gp_back"
+}
+
+pkg_setup() {
+ if use ghcbootstrap; then
+ ewarn "You requested ghc bootstrapping, this is usually only used"
+ ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+ [[ -z $(type -P ghc) ]] && \
+ die "Could not find a ghc to bootstrap with."
+ else
+ if ! yet_binary; then
+ eerror "Please try emerging with USE=ghcbootstrap and report build"
+ eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+ die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+ fi
+ fi
+}
+
+src_unpack() {
+ # Create the ${S} dir if we're using the binary version
+ use binary && mkdir "${S}"
+
+ # the Solaris and Darwin binaries from ghc (maeder) need to be
+ # unpacked separately, so prevent them from being unpacked
+ local ONLYA=${A}
+ case ${CHOST} in
+ *-darwin* | *-solaris*) ONLYA=${GHC_P}-src.tar.bz2 ;;
+ esac
+ unpack ${ONLYA}
+
+ if [[ -d "${S}"/libraries/dph ]]; then
+ # Sometimes dph libs get accidentally shipped with ghc
+ # but they are not installed unless user requests it.
+ # We never install them.
+ elog "Removing 'libraries/dph'"
+ rm -rf "${S}"/libraries/dph
+ fi
+}
+
+src_prepare() {
+ ghc_setup_cflags
+
+ if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+ # Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+ # See bug #313635.
+ sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+ "${WORKDIR}/usr/bin/ghc-${GHC_PV}"
+
+ # allow hardened users use vanilla binary to bootstrap ghc
+ # ghci uses mmap with rwx protection at it implements dynamic
+ # linking on it's own (bug #299709)
+ pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${GHC_P}/bin/ghc"
+ fi
+
+ if use binary; then
+ if use prefix; then
+ relocate_ghc "${EPREFIX}"
+ fi
+
+ # Move unpacked files to the expected place
+ mv "${WORKDIR}/usr" "${S}"
+ else
+ if ! use ghcbootstrap; then
+ case ${CHOST} in
+ *-darwin* | *-solaris*)
+ # UPDATE ME for ghc-7
+ mkdir "${WORKDIR}"/ghc-bin-installer || die
+ pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+ use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+ use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+ use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+ use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+ popd > /dev/null
+
+ pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+ # fix the binaries so they run, on Solaris we need an
+ # LD_LIBRARY_PATH which has our prefix libdirs, on
+ # Darwin we need to replace the frameworks with our libs
+ # from the prefix fix before installation, because some
+ # of the tools are actually used during configure/make
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+ elif [[ ${CHOST} == *-darwin* ]] ; then
+ local readline_framework=GNUreadline.framework/GNUreadline
+ local gmp_framework=/opt/local/lib/libgmp.10.dylib
+ local ncurses_file=/opt/local/lib/libncurses.5.dylib
+ for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+ install_name_tool -change \
+ ${readline_framework} \
+ "${EPREFIX}"/lib/libreadline.dylib \
+ ${binary} || die
+ install_name_tool -change \
+ ${gmp_framework} \
+ "${EPREFIX}"/usr/lib/libgmp.dylib \
+ ${binary} || die
+ install_name_tool -change \
+ ${ncurses_file} \
+ "${EPREFIX}"/usr/lib/libncurses.dylib \
+ ${binary} || die
+ done
+ # we don't do frameworks!
+ sed -i \
+ -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+ -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+ rts/package.conf.in || die
+ fi
+
+ # it is autoconf, but we really don't want to give it too
+ # much arguments, in fact we do the make in-place anyway
+ ./configure --prefix="${WORKDIR}"/usr || die
+ make install || die
+ popd > /dev/null
+ ;;
+ *)
+ relocate_ghc "${WORKDIR}"
+ ;;
+ esac
+ fi
+
+ sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+ "${S}/ghc/ghc.wrapper"
+
+ cd "${S}" # otherwise epatch will break
+
+ epatch "${FILESDIR}/ghc-7.0.4-CHOST-prefix.patch"
+
+ epatch "${FILESDIR}"/${PN}-7.8.1_rc1-libbfd.patch
+
+ epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+ # bug 518734
+ epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch
+
+ # upstream backports
+ epatch "${FILESDIR}"/${PN}-7.8.3-linker-warn.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-pic-sparc.patch
+ epatch "${FILESDIR}"/${PN}-7.8.3-ppc32-fPIC.patch
+
+ if use prefix; then
+ # Make configure find docbook-xsl-stylesheets from Prefix
+ sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \
+ -i utils/haddock/doc/configure.ac || die
+ fi
+
+ # as we have changed the build system
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ if ! use binary; then
+ # initialize build.mk
+ echo '# Gentoo changes' > mk/build.mk
+
+ # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+ echo "docdir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk
+ echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk
+
+ # We also need to use the GHC_FLAGS flags when building ghc itself
+ echo "SRC_HC_OPTS+=${GHC_FLAGS}" >> mk/build.mk
+ echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+ echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+
+ # We can't depend on haddock except when bootstrapping when we
+ # must build docs and include them into the binary .tbz2 package
+ # app-text/dblatex is not in portage, can not build PDF or PS
+ if use ghcbootstrap && use doc; then
+ echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk
+ echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk
+ echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk
+ echo "HADDOCK_DOCS = YES" >> mk/build.mk
+ else
+ echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk
+ echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk
+ echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk
+ echo "HADDOCK_DOCS = NO" >> mk/build.mk
+ fi
+
+ # allows overriding build flavours for libraries:
+ # v - vanilla (static libs)
+ # p - profiled
+ # dyn - shared libraries
+ # example: GHC_LIBRARY_WAYS="v dyn"
+ if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+ echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+ fi
+
+ # Get ghc from the unpacked binary .tbz2
+ # except when bootstrapping we just pick ghc up off the path
+ if ! use ghcbootstrap; then
+ export PATH="${WORKDIR}/usr/bin:${PATH}"
+ fi
+
+ if use gmp; then
+ echo "INTEGER_LIBRARY=integer-gmp" >> mk/build.mk
+ else
+ echo "INTEGER_LIBRARY=integer-simple" >> mk/build.mk
+ fi
+
+ # don't strip anything. Very useful when stage2 SIGSEGVs on you
+ echo "STRIP_CMD = :" >> mk/build.mk
+
+ local econf_args=()
+
+ # GHC embeds 'gcc' it was built by and uses it later.
+ # Don't allow things like ccache or versioned binary slip.
+ # We use stable thing across gcc upgrades.
+ is_crosscompile || econf_args+=(--with-gcc=${CHOST}-gcc)
+
+ if ! use ghcmakebinary; then
+ econf_args+=(--with-system-libffi)
+ econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ fi
+
+ econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
+
+ if [[ ${PV} == *9999* ]]; then
+ GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+ GHC_P=${PN}-${GHC_PV}
+ fi
+ GHC_TPF="$(grep 'S\[\"TargetPlatformFull\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+ fi # ! use binary
+}
+
+src_compile() {
+ if ! use binary; then
+ # 1. build compiler binary first
+ emake ghc/stage2/build/tmp/ghc-stage2
+ # 2. pax-mark (bug #516430)
+ pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+ # 3. and then all the rest
+ emake all
+ fi # ! use binary
+}
+
+src_install() {
+ if use binary; then
+ use prefix && mkdir -p "${ED}"
+ mv "${S}/usr" "${ED}"
+
+ # Remove the docs if not requested
+ if ! use doc; then
+ rm -rf "${ED}/usr/share/doc/${P}/*/" \
+ "${ED}/usr/share/doc/${P}/*.html" \
+ || die "could not remove docs (P vs PF revision mismatch?)"
+ fi
+ else
+ # We only build docs if we were bootstrapping, otherwise
+ # we copy them out of the unpacked binary .tbz2
+ if use doc && ! use ghcbootstrap; then
+ mkdir -p "${ED}/usr/share/doc"
+ mv "${WORKDIR}/usr/share/doc/${P}" "${ED}/usr/share/doc" \
+ || die "failed to copy docs"
+ else
+ dodoc "${S}/distrib/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
+ fi
+
+ emake -j1 install DESTDIR="${D}"
+
+ # remove link, but leave 'haddock-${GHC_P}'
+ rm -f "${ED}"/usr/bin/haddock
+
+ if [[ ! -f "${S}/VERSION" ]]; then
+ echo "${GHC_PV}" > "${S}/VERSION" \
+ || die "Could not create file ${S}/VERSION"
+ fi
+ newbashcomp "${FILESDIR}/ghc-bash-completion" ghc-pkg
+
+ fi
+
+ # path to the package.cache
+ local package_confdir="${ED}/usr/$(get_libdir)/${GHC_P}/package.conf.d"
+ PKGCACHE="${package_confdir}"/package.cache
+ # copy the package.conf.d, including timestamp, save it so we can help
+ # users that have a broken package.conf.d
+ cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+ # copy the package.conf, including timestamp, save it so we later can put it
+ # back before uninstalling, or when upgrading.
+ cp -p "${PKGCACHE}"{,.shipped} \
+ || die "failed to copy package.conf.d/package.cache"
+}
+
+pkg_preinst() {
+ # have we got an earlier version of ghc installed?
+ if has_version "<${CATEGORY}/${PF}"; then
+ haskell_updater_warn="1"
+ fi
+}
+
+pkg_postinst() {
+ ghc-reregister
+
+ # path to the package.cache
+ PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache"
+
+ # give the cache a new timestamp, it must be as recent as
+ # the package.conf.d directory.
+ touch "${PKGCACHE}"
+
+ if [[ "${haskell_updater_warn}" == "1" ]]; then
+ ewarn
+ ewarn "\e[1;31m************************************************************************\e[0m"
+ ewarn
+ ewarn "You have just upgraded from an older version of GHC."
+ ewarn "You may have to run"
+ ewarn " 'haskell-updater --upgrade'"
+ ewarn "to rebuild all ghc-based Haskell libraries."
+ ewarn
+ ewarn "\e[1;31m************************************************************************\e[0m"
+ ewarn
+ fi
+}
+
+pkg_prerm() {
+ # Be very careful here... Call order when upgrading is (according to PMS):
+ # * src_install for new package
+ # * pkg_preinst for new package
+ # * pkg_postinst for new package
+ # * pkg_prerm for the package being replaced
+ # * pkg_postrm for the package being replaced
+ # so you'll actually be touching the new packages files, not the one you
+ # uninstall, due to that or installation directory ${GHC_P} will be the same for
+ # both packages.
+
+ # Call order for reinstalling is (according to PMS):
+ # * src_install
+ # * pkg_preinst
+ # * pkg_prerm for the package being replaced
+ # * pkg_postrm for the package being replaced
+ # * pkg_postinst
+
+ # Overwrite the modified package.cache with a copy of the
+ # original one, so that it will be removed during uninstall.
+
+ PKGCACHE="${EROOT}/usr/$(get_libdir)/${GHC_P}/package.conf.d/package.cache"
+ rm -rf "${PKGCACHE}"
+
+ cp -p "${PKGCACHE}"{.shipped,}
+}
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index ce3a93601199..967bd9947093 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -1,4 +1,2 @@
-DIST orc-0.4.16.tar.gz 668368 SHA256 700e4edba20a0ed42164b645da26ce515b883d4c4633b222302f1e541f2a58ab SHA512 e9d3c4e8682119253c201addcd2cb623a61e45d7cb8b0b406a3509f1a9443af9375a418a68f832d29af4a523cd91bf702bdd002cf143be0f7cc9f5a0b77f7ae0 WHIRLPOOL 43e3fafb9869f2f1c678cdb457b958a2ef6955344f71a3377e319c8d42f5ca269e9d4c57a85a792959a6e50d60023bf6717bd8461270b1526aa55cb9657d5012
-DIST orc-0.4.17.tar.gz 724990 SHA256 4fc7cca48c59fff23afee78fb642cdbde001f56401c8f47b95a16578d1d5d7e8 SHA512 3a69da6d39e80dd68570aeac341aed692c041c1cfd91abbc36a269167a9b97b5ab539b873dbf800d4735da276e3aa43d664a7efb13559124e0862d2fc2202306 WHIRLPOOL 99f74f986f5c67d622c3bff8b186a7b5b873997bc455c405a50cb3453ebe162a203ffea9acd2e153a47bac19a5dafe3d4050f8b2b5ed6155499be7627ae46b93
-DIST orc-0.4.18.tar.gz 732377 SHA256 34d3c8a7259f42bed4dcfbc106c5e3d0cc8e17eeaa73128d1c5eaf92883a6a24 SHA512 75f06d603f71077daa952533b33597fb2bce573647ed75496d55e436485b3c58cd6a43865e931c4def32217b0969bb4c07ef222845c28e9e711bfba80d0d9a21 WHIRLPOOL 11f1f0d06fb45fc5c6390159b0776173147330932587570f27c8bd4b0264a0588f4ae1a00a1d0256463357b3a640d785717f3c6d1226d62f11e47a88aab3c8d5
DIST orc-0.4.19.tar.gz 752746 SHA256 e21f50321a21c33178bbe41ea8bd27c49ae60aeb8c22902a215f7141297fb59e SHA512 559fd199523eb8b93e6bae38b07af5fb6f60e7e5a627a088a92ec7bfd1bed3288ea123fdb8634484918359cfe71db10ad0bb86319b652c973b08088c04cd1f73 WHIRLPOOL 06a9b70d54c178b326d60b714ea0bcbfe2a1b791c5efd96a9bacb4e0a725fdbc053af8a751d73c8b93e7f8079384def59a93855e19f1fc3a1e359cede52c8009
+DIST orc-0.4.23.tar.xz 450076 SHA256 767eaebce2941737b43368225ec54598b3055ca78b4dc50c4092f5fcdc0bdfe7 SHA512 e12bca0dcc7230da825834f50b88ff531a6aed83a29ccc5b57e969adb1af7ceb2c1d4dd04cd248e38db92fded6edc809c7deba42cd1ddeacd62b0e922950d92e WHIRLPOOL 62df2cbc9943b7c7e625519d0f16bf1becbce78b26ccaebbc315ac43f2ceee689b6ad6632ce5e49123aa59d97ec73c3268a3fd6b81f94ca4dcf97de7a3a222e5
diff --git a/dev-lang/orc/files/orc-0.4.17-AM_CONFIG_HEADER.patch b/dev-lang/orc/files/orc-0.4.17-AM_CONFIG_HEADER.patch
deleted file mode 100644
index 6ee70d9209e6..000000000000
--- a/dev-lang/orc/files/orc-0.4.17-AM_CONFIG_HEADER.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8905d3d5bf8005944268c3500eec20b61923de89 Mon Sep 17 00:00:00 2001
-From: Josep Torra
-Date: Sat, 30 Mar 2013 12:52:33 +0100
-Subject: [PATCH] configure: replace deprecated AM_CONFIG_HEADER with
- AC_CONFIG_HEADERS
-
-AM_CONFIG_HEADER has been removed in the just-released automake 1.13:
-https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 89812ba..4ebebd1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(1.6)
- ORC_MAJORMINOR=0.4
- AC_SUBST(ORC_MAJORMINOR)
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
-
- dnl CURRENT, REVISION, AGE
- dnl - library source changed -> increment REVISION
---
-1.8.2.1
-
diff --git a/dev-lang/orc/orc-0.4.16-r1.ebuild b/dev-lang/orc/orc-0.4.16-r1.ebuild
deleted file mode 100644
index e1bafd0696ac..000000000000
--- a/dev-lang/orc/orc-0.4.16-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16-r1.ebuild,v 1.6 2013/04/29 13:49:11 tetromino Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="http://code.entropywave.com/projects/orc/"
-SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs examples"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am"
-
-src_prepare() {
- if ! use examples; then
- sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
- epatch "${FILESDIR}/${PN}-0.4.17-AM_CONFIG_HEADER.patch" # in 0.4.18
- AT_M4DIR="m4" eautoreconf
- fi
-}
-
-src_configure() {
- # any optimisation on PPC/Darwin yields in a complaint from the assembler
- # Parameter error: r0 not allowed for parameter %lu (code as 0 not r0)
- # the same for Intel/Darwin, although the error message there is different
- # but along the same lines
- [[ ${CHOST} == *-darwin* ]] && filter-flags -O*
- econf \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-lang/orc/orc-0.4.17-r1.ebuild b/dev-lang/orc/orc-0.4.17-r1.ebuild
deleted file mode 100644
index 0fa66fb04c63..000000000000
--- a/dev-lang/orc/orc-0.4.17-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.17-r1.ebuild,v 1.1 2013/08/10 16:04:59 aballier Exp $
-
-EAPI="5"
-inherit autotools eutils flag-o-matic autotools-multilib
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="http://code.entropywave.com/projects/orc/"
-SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs examples"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am"
-
-src_prepare() {
- if ! use examples; then
- sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
- epatch "${FILESDIR}/${P}-AM_CONFIG_HEADER.patch" # in 0.4.18
- AT_M4DIR="m4" eautoreconf
- fi
-}
-
-src_configure() {
- # any optimisation on PPC/Darwin yields in a complaint from the assembler
- # Parameter error: r0 not allowed for parameter %lu (code as 0 not r0)
- # the same for Intel/Darwin, although the error message there is different
- # but along the same lines
- [[ ${CHOST} == *-darwin* ]] && filter-flags -O*
- autotools-multilib_src_configure
-}
diff --git a/dev-lang/orc/orc-0.4.17.ebuild b/dev-lang/orc/orc-0.4.17.ebuild
deleted file mode 100644
index 1f595611806d..000000000000
--- a/dev-lang/orc/orc-0.4.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.17.ebuild,v 1.1 2013/04/29 13:49:11 tetromino Exp $
-
-EAPI="5"
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="http://code.entropywave.com/projects/orc/"
-SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs examples"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am"
-
-src_prepare() {
- if ! use examples; then
- sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
- epatch "${FILESDIR}/${P}-AM_CONFIG_HEADER.patch" # in 0.4.18
- AT_M4DIR="m4" eautoreconf
- fi
-}
-
-src_configure() {
- # any optimisation on PPC/Darwin yields in a complaint from the assembler
- # Parameter error: r0 not allowed for parameter %lu (code as 0 not r0)
- # the same for Intel/Darwin, although the error message there is different
- # but along the same lines
- [[ ${CHOST} == *-darwin* ]] && filter-flags -O*
- econf \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/dev-lang/orc/orc-0.4.18.ebuild b/dev-lang/orc/orc-0.4.23.ebuild
similarity index 66%
rename from dev-lang/orc/orc-0.4.18.ebuild
rename to dev-lang/orc/orc-0.4.23.ebuild
index 396fbcfff8c3..2228bbf3f949 100644
--- a/dev-lang/orc/orc-0.4.18.ebuild
+++ b/dev-lang/orc/orc-0.4.23.ebuild
@@ -1,23 +1,23 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.18.ebuild,v 1.5 2014/04/21 10:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.23.ebuild,v 1.1 2014/12/24 14:36:20 leio Exp $
EAPI="5"
inherit autotools-multilib flag-o-matic
DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="http://code.entropywave.com/projects/orc/"
-SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="BSD BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm hppa x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
RDEPEND=""
DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
+ >=dev-util/gtk-doc-am-1.12
"
src_prepare() {
diff --git a/dev-lang/php/php-5.4.36.ebuild b/dev-lang/php/php-5.4.36.ebuild
index 7570e19516d8..2049a8336004 100644
--- a/dev-lang/php/php-5.4.36.ebuild
+++ b/dev-lang/php/php-5.4.36.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.36.ebuild,v 1.6 2014/12/23 12:44:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.36.ebuild,v 1.8 2014/12/24 14:45:56 ago Exp $
EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/php/php-5.5.20.ebuild b/dev-lang/php/php-5.5.20.ebuild
index bda080b7abab..380b04a6cca2 100644
--- a/dev-lang/php/php-5.5.20.ebuild
+++ b/dev-lang/php/php-5.5.20.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.20.ebuild,v 1.6 2014/12/23 12:44:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.20.ebuild,v 1.8 2014/12/24 14:45:56 ago Exp $
EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/python/python-2.7.9.ebuild b/dev-lang/python/python-2.7.9.ebuild
index 62235a9ac90e..f8cdabb4c566 100644
--- a/dev-lang/python/python-2.7.9.ebuild
+++ b/dev-lang/python/python-2.7.9.ebuild
@@ -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-lang/python/python-2.7.9.ebuild,v 1.4 2014/12/23 09:03:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.9.ebuild,v 1.6 2014/12/24 14:45:22 ago Exp $
EAPI="4"
WANT_AUTOMAKE="none"
@@ -18,7 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild b/dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild
index 744ef6501b86..d89d10720d81 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild
@@ -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-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild,v 1.2 2014/12/08 13:15:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild,v 1.3 2014/12/24 00:35:05 eva Exp $
EAPI=5
GCONF_DEBUG="no"
@@ -22,7 +22,7 @@ RDEPEND="
app-arch/libarchive
dev-db/sqlite:3
>=dev-libs/glib-2.16.1:2
- media-libs/fontconfig
+ >=media-libs/fontconfig-2.11
>=media-libs/freetype-2.4:2
>=net-libs/libsoup-2.24:2.4
>=x11-libs/gdk-pixbuf-2.14:2
diff --git a/dev-libs/boost/boost-1.55.0-r1.ebuild b/dev-libs/boost/boost-1.55.0-r1.ebuild
deleted file mode 100644
index 57a42d24df40..000000000000
--- a/dev-libs/boost/boost-1.55.0-r1.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild,v 1.9 2014/10/14 09:57:35 pinkbyte Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
-
-MY_P="${PN}_$(replace_all_version_separators _)"
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
-
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
- !icu? ( virtual/libiconv )
- mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
- python? ( ${PYTHON_DEPS} )
- app-arch/bzip2
- sys-libs/zlib
- !app-admin/eselect-boost"
-DEPEND="${RDEPEND}
- =dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
- mpi? ( threads )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-create_user-config.jam() {
- local compiler compiler_version compiler_executable
-
- if [[ ${CHOST} == *-darwin* ]]; then
- compiler="darwin"
- compiler_version="$(gcc-fullversion)"
- compiler_executable="$(tc-getCXX)"
- else
- compiler="gcc"
- compiler_version="$(gcc-version)"
- compiler_executable="$(tc-getCXX)"
- fi
- local mpi_configuration python_configuration
-
- if use mpi; then
- mpi_configuration="using mpi ;"
- fi
-
- if use python; then
- python_configuration="using python : : ${PYTHON} ;"
- fi
-
- cat > user-config.jam << __EOF__
-using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
- # Bail out on unsupported build configuration, bug #456792
- if [[ -f "${EROOT}etc/site-config.jam" ]]; then
- grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q gentoodebug "${EROOT}etc/site-config.jam" ||
- (
- eerror "You are using custom ${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
- eerror "Boost can not be built in such configuration."
- eerror "Please, either remove this file or add targets from ${EROOT}usr/share/boost-build/site-config.jam to it."
- die
- )
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
- "${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \
- "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
- "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
- "${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
- "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
- "${FILESDIR}/${PN}-1.55.0-context-x32.patch" \
- "${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \
- "${FILESDIR}/${PN}-1.52.0-threads.patch"
-
- epatch_user
-}
-
-ejam() {
- echo b2 "$@"
- b2 "$@"
-}
-
-src_configure() {
- # Workaround for too many parallel processes requested, bug #506064
- [ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
-
- OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2 --user-config=${S}/user-config.jam"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # We need to add the prefix, and in two cases this exceeds, so prepare
- # for the largest possible space allocation.
- append-ldflags -Wl,-headerpad_max_install_names
- elif [[ ${CHOST} == *-winnt* ]]; then
- compiler=parity
- if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
- compilerVersion=trunk
- else
- compilerVersion=$($(tc-getCXX) -v | sed '1q' \
- | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
- fi
- compilerExecutable=$(tc-getCXX)
- fi
-
- # bug 298489
- if use ppc || use ppc64; then
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
- fi
-
- # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
- append-cxxflags -std=gnu++98
-
- use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr"
- use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
- use mpi || OPTIONS+=" --without-mpi"
- use python || OPTIONS+=" --without-python"
- use nls || OPTIONS+=" --without-locale"
- use context || OPTIONS+=" --without-context --without-coroutine"
-
- OPTIONS+=" pch=off"
- OPTIONS+=" --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\""
- OPTIONS+=" --layout=system"
- OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)"
-
- [[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
-}
-
-src_compile() {
- export BOOST_ROOT="${S}"
- PYTHON_DIRS=""
- MPI_PYTHON_MODULE=""
-
- building() {
- create_user-config.jam
-
- ejam ${OPTIONS} \
- $(use python && echo --python-buildid=${EPYTHON#python}) \
- || die "Building of Boost libraries failed"
-
- if use python; then
- if [[ -z "${PYTHON_DIRS}" ]]; then
- PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
- else
- if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
- die "Inconsistent structure of build directories"
- fi
- fi
-
- local dir
- for dir in ${PYTHON_DIRS}; do
- mv ${dir} ${dir}-${EPYTHON} \
- || die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
- done
-
- if use mpi; then
- if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
- MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
- if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
- die "Multiple mpi.so files found"
- fi
- else
- if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
- die "Inconsistent structure of build directories"
- fi
- fi
-
- mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
- || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
- fi
- fi
- }
- if use python; then
- python_foreach_impl building
- else
- building
- fi
-
- if use tools; then
- pushd tools > /dev/null || die
-
- ejam ${OPTIONS} \
- || die "Building of Boost tools failed"
- popd > /dev/null || die
- fi
-}
-
-src_install () {
- installation() {
- create_user-config.jam
-
- if use python; then
- local dir
- for dir in ${PYTHON_DIRS}; do
- cp -pr ${dir}-${EPYTHON} ${dir} \
- || die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
- done
-
- if use mpi; then
- cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
- || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
- cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
- || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
- fi
- fi
-
- ejam ${OPTIONS} \
- --includedir="${ED}usr/include" \
- --libdir="${ED}usr/$(get_libdir)" \
- $(use python && echo --python-buildid=${EPYTHON#python}) \
- install || die "Installation of Boost libraries failed"
-
- if use python; then
- rm -r ${PYTHON_DIRS} || die
-
- # Move mpi.so Python module to Python site-packages directory.
- # https://svn.boost.org/trac/boost/ticket/2838
- if use mpi; then
- local moddir=$(python_get_sitedir)/boost
- # moddir already includes eprefix
- mkdir -p "${D}${moddir}" || die
- mv "${ED}usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
- cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
- import DLFCN
- flags = sys.getdlopenflags()
- sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
- from . import mpi
- sys.setdlopenflags(flags)
- del DLFCN, flags
-else:
- from . import mpi
-del sys
-EOF
- fi
-
- python_optimize
- fi
- }
- if use python; then
- python_foreach_impl installation
- else
- installation
- fi
-
- if ! use python; then
- rm -r "${ED}"/usr/include/boost/python* || die
- fi
-
- if ! use nls; then
- rm -r "${ED}"/usr/include/boost/locale || die
- fi
-
- if ! use context; then
- rm -r "${ED}"/usr/include/boost/context || die
- rm -r "${ED}"/usr/include/boost/coroutine || die
- fi
-
- if use doc; then
- find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
- dohtml \
- -A pdf,txt,cpp,hpp \
- *.{htm,html,png,css} \
- -r doc
- dohtml -A pdf,txt -r tools
- insinto /usr/share/doc/${PF}/html
- doins -r libs
- doins -r more
-
- # To avoid broken links
- insinto /usr/share/doc/${PF}/html
- doins LICENSE_1_0.txt
-
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
- fi
-
- pushd "${ED}usr/$(get_libdir)" > /dev/null || die
-
- local ext=$(get_libname)
- if use threads; then
- local f
- for f in *${ext}; do
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
- done
- fi
-
- popd > /dev/null || die
-
- if use tools; then
- dobin dist/bin/*
-
- insinto /usr/share
- doins -r dist/share/boostbook
- fi
-
- # boost's build system truely sucks for not having a destdir. Because for
- # this reason we are forced to build with a prefix that includes the
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
- # DESTROOT instread of the actual EPREFIX. There is no way out of here
- # but to do it the dirty way of manually setting the right install_names.
- if [[ ${CHOST} == *-darwin* ]]; then
- einfo "Working around completely broken build-system(tm)"
- local d
- for d in "${ED}"usr/lib/*.dylib; do
- if [[ -f ${d} ]]; then
- # fix the "soname"
- ebegin " correcting install_name of ${d#${ED}}"
- install_name_tool -id "/${d#${D}}" "${d}"
- eend $?
- # fix references to other libs
- refs=$(otool -XL "${d}" | \
- sed -e '1d' -e 's/^\t//' | \
- grep "^libboost_" | \
- cut -f1 -d' ')
- local r
- for r in ${refs}; do
- ebegin " correcting reference to ${r}"
- install_name_tool -change \
- "${r}" \
- "${EPREFIX}/usr/lib/${r}" \
- "${d}"
- eend $?
- done
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # Yai for having symlinks that are nigh-impossible to remove without
- # resorting to dirty hacks like these. Removes lingering symlinks
- # from the slotted versions.
- local symlink
- for symlink in "${EROOT}usr/include/boost" "${EROOT}usr/share/boostbook"; do
- [[ -L ${symlink} ]] && rm -f "${symlink}"
- done
-}
diff --git a/dev-libs/boost/boost-1.56.0.ebuild b/dev-libs/boost/boost-1.56.0-r1.ebuild
similarity index 98%
rename from dev-libs/boost/boost-1.56.0.ebuild
rename to dev-libs/boost/boost-1.56.0-r1.ebuild
index ef8d52f675f1..ef39d25a5e3a 100644
--- a/dev-libs/boost/boost-1.56.0.ebuild
+++ b/dev-libs/boost/boost-1.56.0-r1.ebuild
@@ -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-libs/boost/boost-1.56.0.ebuild,v 1.3 2014/10/14 09:57:35 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.1 2014/12/24 12:36:25 pinkbyte Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -108,7 +108,8 @@ src_prepare() {
"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
"${FILESDIR}/${PN}-1.55.0-context-x32.patch" \
"${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \
- "${FILESDIR}/${PN}-1.52.0-threads.patch"
+ "${FILESDIR}/${PN}-1.52.0-threads.patch" \
+ "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
# Do not try to build missing 'wave' tool, bug #522682
# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
new file mode 100644
index 000000000000..5175800e3f49
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
@@ -0,0 +1,13 @@
+Build auto_index tool with USE="tools"
+Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066
+
+--- tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300
++++ tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300
+@@ -20,6 +20,7 @@
+ use-project /boost/regression : regression/build ;
+
+ TOOLS =
++ auto_index/build//auto_index
+ bcp//bcp
+ inspect/build//inspect
+ quickbook//quickbook
diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest
new file mode 100644
index 000000000000..632facb182c5
--- /dev/null
+++ b/dev-libs/gumbo/Manifest
@@ -0,0 +1 @@
+DIST gumbo-0.9.2.tar.gz 2087953 SHA256 82e5cd81e26a3eaac308ba9111573ecce2b48b550c673a6ec09853c12b05a381 SHA512 b04d95f43358afb4b5cf06749f6f325e00f52f6d87fba3a992f92a1c2bcb1e4ded7629379e905ed3e3c42c5685eecca78e44c4fd416e3336420b684b49637303 WHIRLPOOL ef20a3db2125c7dd5869a37241483a95f1de7dccce582f1f7b98cb79501354ece8535ebb4a687b0d668ad584e9b751b15450a5efb7ee39ecf865f20db6e7f33c
diff --git a/dev-libs/gumbo/gumbo-0.9.2.ebuild b/dev-libs/gumbo/gumbo-0.9.2.ebuild
new file mode 100644
index 000000000000..840da4e807ed
--- /dev/null
+++ b/dev-libs/gumbo/gumbo-0.9.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gumbo/gumbo-0.9.2.ebuild,v 1.1 2014/12/24 06:51:31 graaff Exp $
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="An implementation of the HTML5 parsing algorithm implemented as a pure C99 library"
+HOMEPAGE="https://github.com/google/gumbo-parser#readme"
+SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+
+S="${WORKDIR}/gumbo-parser-${PV}"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/dev-libs/gumbo/metadata.xml b/dev-libs/gumbo/metadata.xml
new file mode 100644
index 000000000000..c378f8d71389
--- /dev/null
+++ b/dev-libs/gumbo/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ graaff@gentoo.org
+
+
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
new file mode 100644
index 000000000000..b721a8b55cb9
--- /dev/null
+++ b/dev-libs/libinput/Manifest
@@ -0,0 +1 @@
+DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
diff --git a/dev-libs/libinput/libinput-0.7.0.ebuild b/dev-libs/libinput/libinput-0.7.0.ebuild
new file mode 100644
index 000000000000..dc8583b8e33f
--- /dev/null
+++ b/dev-libs/libinput/libinput-0.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/libinput-0.7.0.ebuild,v 1.1 2014/12/23 22:25:18 eva Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+# License appears to be a variant of libtiff
+LICENSE="libtiff"
+SLOT="0/5"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ >=dev-libs/libevdev-0.4
+ >=sys-libs/mtdev-1.1
+ virtual/libudev
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-libs/check-0.9.10 )
+"
+# tests can even use: dev-util/valgrind
+
+src_prepare() {
+ # Doc handling in kinda strange but everything
+ # is available in the tarball already.
+ sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+ # gui can be built but will not be installed
+ econf \
+ --disable-event-gui \
+ $(use_enable test tests)
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc -r doc/html
+ prune_libtool_files
+}
diff --git a/dev-libs/libinput/metadata.xml b/dev-libs/libinput/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/dev-libs/libinput/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+gnome
+
diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
index 393fcf65c18c..47081b8ee4a2 100644
--- a/dev-lua/luafilesystem/Manifest
+++ b/dev-lua/luafilesystem/Manifest
@@ -1,3 +1,2 @@
-DIST luafilesystem-1.4.1.tar.gz 25424 SHA256 e0ec9940ebd7370e5eec95e3795423d7ab225dcbb679344555b7cc2e593c8b4a SHA512 383d0fa584366aed26627bf5d19bd404199c7d1b819d2e2ebdeab204f73a2aafa2b236b86cc9792bf0655659eda8be2bfd509b7fa19a91f868ae2b36bbef0919 WHIRLPOOL 54931a9e89d6b0e3aee70355fa30d8ec15237f74cad0ff4dc57cb1b780ccaa37dcc5b0366b3c2f0eba4effc362764f13a956ed8524c7fafe11fb40d000be53bc
-DIST luafilesystem-1.4.2.tar.gz 25408 SHA256 954d19f16d5f97cbd7b09893cbad7f42af44770930f5c1caec80d0b04547121a SHA512 a03ea5cb406bccd3a173fc465b536a8e922d4c1fc1b82f1a1661c656b789cdb4df106cd30e8f8aaeb77731a8ac4c728f1f7f46c546d22e3ccd22de9bc605f50a WHIRLPOOL 9f84ff65596e0a4345024a9f4175eb9f237c608874c7433cff6a00de2465e27059c0b745e629254a897f44519239178a57be47837a34c68cbfd257fb317a7ccb
DIST luafilesystem-1.5.0.tar.gz 26660 SHA256 00f6e1dc1e1da7f0fa77e375f0a04908ec4241a4c5e8d98031614f4a4a50c7cb SHA512 79e767be5b923424c2f3c0025e050b6a5b15550cf96d153072f817b0f94757032feeaa579e4d73cc009a5954d38a30079db1c1c15545a45e9f13c0c776080aac WHIRLPOOL 67b3e3c82ddf0732afbd0c49dcff7608520742c7aca0aa38d709f282322d8b0487654c662327b68f3f451492e70ff5e9b485453090d792541a7aedf1efdc8fdf
+DIST luafilesystem-1.6.2.tar.gz 27886 SHA256 4ad16df9958314662a459fec848d233d59313ef4992808a290053c1614532018 SHA512 75debecd3b35d43e76b51de02cface73808547be6a26e15c06c969c50bbfd7c4d0801ccb68812b7ecb99e56eaa63deeadaba6d0387748e215e5bdab784d463ff WHIRLPOOL 156fcb9b902fe8191925c12bbeaac14525c24ebbeff22bfb1bead3429090b074a29e41bf25d903692cf33fe53ca5983b3f935476e765b1ba0804e2113e026561
diff --git a/dev-lua/luafilesystem/luafilesystem-1.4.1.ebuild b/dev-lua/luafilesystem/luafilesystem-1.4.1.ebuild
deleted file mode 100644
index 1288600c0654..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luafilesystem/luafilesystem-1.4.1.ebuild,v 1.1 2010/11/05 23:12:31 rafaelmartins Exp $
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="http://www.keplerproject.org/luafilesystem/"
-SRC_URI="http://luaforge.net/frs/download.php/3345/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-lang/lua-5.1"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i \
- -e "s|/usr/local|/usr|" \
- -e "s|/lib|/$(get_libdir)|" \
- -e "s|-O2|${CFLAGS}|" \
- -e "s|gcc|$(tc-getCC)|" \
- config || die
-}
-
-src_install() {
- emake PREFIX="${D}usr" install || die
- dodoc README
- dohtml doc/us/*
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.4.2.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
similarity index 57%
rename from dev-lua/luafilesystem/luafilesystem-1.4.2.ebuild
rename to dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
index c26a1dfac262..0817fbf4e006 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.4.2.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luafilesystem/luafilesystem-1.4.2.ebuild,v 1.1 2010/11/05 23:12:31 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luafilesystem/luafilesystem-1.6.2.ebuild,v 1.1 2014/12/24 10:41:04 mrueg Exp $
+EAPI=5
inherit multilib toolchain-funcs
DESCRIPTION="File System Library for the Lua Programming Language"
-HOMEPAGE="http://www.keplerproject.org/luafilesystem/"
-SRC_URI="http://luaforge.net/frs/download.php/3931/${P}.tar.gz"
+HOMEPAGE="http://keplerproject.github.com/luafilesystem/"
+SRC_URI="mirror://github/keplerproject/luafilesystem/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE=""
DEPEND=">=dev-lang/lua-5.1"
RDEPEND="${DEPEND}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
sed -i \
-e "s|/usr/local|/usr|" \
-e "s|/lib|/$(get_libdir)|" \
-e "s|-O2|${CFLAGS}|" \
+ -e "/^LIB_OPTION/s|= |= ${LDFLAGS} |" \
-e "s|gcc|$(tc-getCC)|" \
config || die
}
src_install() {
- emake PREFIX="${D}usr" install || die
+ emake PREFIX="${ED}usr" install
dodoc README
dohtml doc/us/*
}
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index b81278ae05ca..4491d1ae06c0 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,3 +1,3 @@
DIST luasec-0.4.1.tar.gz 28646 SHA256 9a9ea9f23044d41be29aea3de1bd795118a29e7311ea4c55fe1f0bc1c74a448b SHA512 bc934e952294ec45c9c8cfb70f68ebcd415b241d4af8dbf649016a7d14d7da5380d12cbf490560425235168f2c5abbbcd48192068a4e8e6bf523c92cfbf604d9 WHIRLPOOL 90ebad1e0f9fba88bbfe3832ef61cf1daab3cf3694bb0d4466772a24ad103f737737af93df77cc6aea04a98fb9ad0cdf0dcf6f2a09667643a8cabbd6030e7d49
DIST luasec-0.4.1_p20130620.tar.gz 45297 SHA256 8bb3e8c5c3a4980f027b7ab41d5a08a2d44834e4230bcb6a2638ba4a7a3dc53f SHA512 914ae2adf7ce48c78d972ae5cbe2b52cbd42083cbe98063c36bd52af52b3bdec4cb389b8599928b2703436fc8eaf70de3212def0adaf936c7bbedf650f9c8c4e WHIRLPOOL 7a7c8e43ae846a8351c39a1dbfaab091a9d12c197538413137c0de807da6d20b894155fd9ec1f4bdefd7090a7b7cdb7ef195165870a6b5addd1ad66ad7208d11
-DIST luasec-0.4.tar.gz 27829 SHA256 111732f0e646120a701d33e7d3a613a9a901c11c0a01d0805d73ef90c3f0abd5 SHA512 dfd1b7427ffbd0537707885cdf3ef0d453c745d0c37f682cae71c47374aff6a935d1687ffc8252cc25d5dec174644e962fbcac0e735ba3f07d633c432ecd08bc WHIRLPOOL 72b7eb7eb0640d9c132918bb82dff6ef36701d105ac309ef0f5a6a84929d9cf0bb48ff9891d138d85a25e357d53493e590735712f45ac7e98fd866d29c1740f0
+DIST luasec-0.5.tar.gz 46738 SHA256 6480598f7492ac479b6b608b5fb1488226bfa6ef675e29f6b24dbe9099083523 SHA512 fcf88f2566952c4d12be95531991180a1f3bd60f7dda41997f93c80ccc8d9dfd44b00e3330a07e451489dc9cd0640f7841101c10867e270608187df78549fe2f WHIRLPOOL 46d87a3ee3a6cf1413696c1dee0ea77913e6ffce94789e36f28ca5b2ec737cd1d2c81852c5b96958dcf53c22eee20d24102fb3ceea923692dbfb848b2fc52215
diff --git a/dev-lua/luasec/luasec-0.4.ebuild b/dev-lua/luasec/luasec-0.4.ebuild
deleted file mode 100644
index 6638356b602a..000000000000
--- a/dev-lua/luasec/luasec-0.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luasec/luasec-0.4.ebuild,v 1.4 2014/08/10 20:42:04 slyfox Exp $
-
-EAPI=2
-
-inherit multilib toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="http://www.inf.puc-rio.br/~brunoos/luasec/"
-SRC_URI="http://www.inf.puc-rio.br/~brunoos/luasec/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/lua-5.1[deprecated]
- dev-lua/luasocket
- dev-libs/openssl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- sed -i -e "s#^LUAPATH=.*#LUAPATH=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/Makefile"
- sed -i -e "s#^LUACPATH=.*#LUACPATH=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/Makefile"
- epatch "${FILESDIR}/${P}_Makefile.patch"
-}
-
-src_compile() {
- append-flags -fPIC
- emake \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)" \
- LD="$(tc-getCC) -shared" \
- linux \
- || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-lua/luasec/luasec-0.5.ebuild b/dev-lua/luasec/luasec-0.5.ebuild
new file mode 100644
index 000000000000..749cdf797bad
--- /dev/null
+++ b/dev-lua/luasec/luasec-0.5.ebuild
@@ -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-lua/luasec/luasec-0.5.ebuild,v 1.1 2014/12/24 10:36:09 mrueg Exp $
+
+EAPI=5
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
+HOMEPAGE="https://github.com/brunoos/luasec http://www.inf.puc-rio.br/~brunoos/luasec/"
+SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}-${P}
+
+RDEPEND=">=dev-lang/lua-5.1[deprecated]
+ dev-lua/luasocket
+ dev-libs/openssl"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i -e "s#^LUAPATH.*#LUAPATH=$(pkg-config --variable INSTALL_LMOD lua)#"\
+ -e "s#^LUACPATH.*#LUACPATH=$(pkg-config --variable INSTALL_CMOD lua)#" Makefile || die
+ sed -i -e "s/-O2//" src/Makefile || die
+ lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getCC)" \
+ linux
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r2.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r2.ebuild
deleted file mode 100644
index 876498dcbf13..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luasocket/luasocket-3.0_rc1-r2.ebuild,v 1.6 2014/08/10 20:42:11 slyfox Exp $
-
-EAPI=5
-
-inherit multilib flag-o-matic
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"
-SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips x86"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/lua-5.1[deprecated]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-
-RESTRICT="test"
-
-src_compile() {
- emake \
- CC="$(tc-getCC) ${CFLAGS}" \
- LD="$(tc-getCC) ${LDFLAGS}"\
- $(usex debug DEBUG="DEBUG" "")
-}
-
-src_install() {
- local luav=$(pkg-config --variable V lua)
- emake \
- DESTDIR="${D}" \
- LUAPREFIX_linux=/usr \
- LUAV=${luav} \
- CDIR_linux=$(get_libdir)/lua/${luav} \
- install-unix
- dodoc NEW README
- dohtml doc/*
-}
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index 9c6898442070..6a0521627943 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1,3 +1,4 @@
DIST aniso8601-0.82.tar.gz 64186 SHA256 e33ffc4ff6882e6a318c07844e346cd6160abe2f48cc2e797d2fe5f36364789e SHA512 7b43f0d6284b55f4a56d376f1898c8375336f7c66ddda3fc35766409feae80b5d9e0d86667204fbc896195ab625233d0207eefe52c110a52d79acf07378e55fc WHIRLPOOL 895ef0c4e5d00f142376db3a40200775ed9e1fbe509b82bec279a79c82374afdeb8da7d2f5e5e7720ec2c892d498f61538f977ae8cc806e62472d01f66fd5583
DIST aniso8601-0.83.tar.gz 58487 SHA256 1153cfe2599da556c6ce664b12c0e39659340cc6633a316b34eaac480f276429 SHA512 393bbc59dfad69be4224c1149fdfd305486188aae14336b065791e994c50719ba163ba7a701fc785a25ff983861242a8d171a39139f4d475c002f4f4b8405761 WHIRLPOOL f32edfa8d52c820d466322b7b1a4e1cd1d5514276fe7c4cbf529453d4015b1608abd507a199b5079fb36fcb7f0c070675384677877649bb0da51c1249f85d818
DIST aniso8601-0.90.tar.gz 64577 SHA256 2c0ec72a4185c2dd05eac0b2faa8d47a0477a17ca0784e1a547e544777116226 SHA512 b238461b5fa10236a9f6e9af5befff88b263fea872655dfb479b00045f4da07b7ec6ead9822f49b19ea0bc105d33db76a99efb4dec04fe85761bb0dcdc2a7d44 WHIRLPOOL 6c6df3d4cb1a2484050ff29113ad7f5a45c5dc2efd49aed50cb2286541c3cf562cee777fca3845108f7dd19f3281f720b32a7bafe337f01b13dc59978f0b768c
+DIST aniso8601-0.92.tar.gz 17810 SHA256 60860b5a13bf3c60ab5bc849ac5c55a1cb4113434eff032281ceb47578cc9da9 SHA512 4c962d42d4a09cb7b2625338489a76dd998201e9f12c86b81ca166113741837941a3b0287dbb13fb3bb42ef95a86c0f28816553556d283b85114b1ce705059d5 WHIRLPOOL 0d39a2309e4687ce1699db2a23bfd3a35ae15e65c056c3823dd77d74f6e863b0c2243bb2284fdb0c2f9d56e30f1e50110c857fcf5183967509efb0091f9458bc
diff --git a/dev-python/aniso8601/aniso8601-0.92.ebuild b/dev-python/aniso8601/aniso8601-0.92.ebuild
new file mode 100644
index 000000000000..1c3395cf4135
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-0.92.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aniso8601/aniso8601-0.92.ebuild,v 1.1 2014/12/24 09:23:13 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for parsing ISO 8601 strings"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.python.org/pypi/aniso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ "${PYTHON}" -m unittest discover ${PN}/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 33d1fc2eed5a..7112a384f023 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,2 +1,3 @@
DIST cryptography_vectors-0.5.4.tar.gz 19093455 SHA256 3537837ef31814fb25c082274a64042bf2c52b6108b99374d1eee505097ccf36 SHA512 b548130a4566928c9103b57c1b441fb8a52ced337d358126b6ce9e8bc9566690f321b6f83ed7858a5d6171465ec862f654624bebc9874bb6990502bab5f629d2 WHIRLPOOL c1e03779a72332bea7f41eb53e60a7eb41ca93201fe184434f51bc6e71333752c61dd15e503dbbd65862159a662a7115f8bc44eef59265abd74350b50cb01e6c
DIST cryptography_vectors-0.6.1.tar.gz 19348556 SHA256 79d0cd0a4ae89e013f0a9e8df7a4bedc2ecdf3dc8ee1df64c5e4381756eb41cf SHA512 00a802cf8ee3a56236b67b1405f593300141e63f5354182ea5e229516b52ab870f3164009aa47bb75d2294d5587f4b0ad531f3cef867e70bcce87eadd1743cc0 WHIRLPOOL c37ace825f40664890fdcf600fc9213741f2abc168fc5794a80f9224d940bd980bffd4a3c0333f379d238247e97ea3f098a94632cbc2a5ee59e6a32bae8f9cb0
+DIST cryptography_vectors-0.7.tar.gz 21375413 SHA256 73c84276e5932a4d6b28394c31393350f27b61f66619e5ef5b6932fa835ea084 SHA512 5cb54bb32822d454fa449dc8c5add75efb430722d62ea0c7b591b27d681db5384522d9892bfdd088d00e2ec933564566302ca7b14d94b9e79f11151b2b816f08 WHIRLPOOL 10f14c934d08289dca26a398ce58e4b7b262bf802bc3491831424b769922ddbd63957083da8a66646c74425aaa4234e6b8a1b8b9671213bebba1a607c1a33f01
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild
index 01ec57646d7d..b0d2d45bfd89 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild
@@ -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/cryptography-vectors/cryptography-vectors-0.6.1.ebuild,v 1.2 2014/12/09 10:23:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild,v 1.3 2014/12/24 07:25:57 maekke Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.7.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.7.ebuild
new file mode 100644
index 000000000000..02823242e558
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.7.ebuild,v 1.1 2014/12/24 07:11:09 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/cryptography-0.6.1.ebuild b/dev-python/cryptography/cryptography-0.6.1.ebuild
index fab166207b87..714ca73bf703 100644
--- a/dev-python/cryptography/cryptography-0.6.1.ebuild
+++ b/dev-python/cryptography/cryptography-0.6.1.ebuild
@@ -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/cryptography/cryptography-0.6.1.ebuild,v 1.5 2014/12/09 10:23:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.6.1.ebuild,v 1.6 2014/12/24 07:27:30 maekke Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-python/cytoolz/Manifest b/dev-python/cytoolz/Manifest
index 5c0fca895663..f69a4cc215aa 100644
--- a/dev-python/cytoolz/Manifest
+++ b/dev-python/cytoolz/Manifest
@@ -1 +1,2 @@
DIST cytoolz-0.7.0.tar.gz 238337 SHA256 0205485c054a273fe66f247293e894c7be57f999e829fe26041230d7ea3b70df SHA512 317ae08a80ef71e77fbced57bd95b9276e60399172c4711ee7e8cab353b50b7f51426c5a3d7344a37ebe9553ef8e4a7e02d03401ed6324e4c5bb75a8135cf3a1 WHIRLPOOL de928c42da2e10576f57fcfb44b66f4e0b6061211bccb2765958daa1ef59a8690f8d2b057da76546d928043a27b4e42779985ad2f5b1745c4f006023174c16ae
+DIST cytoolz-0.7.1.tar.gz 250988 SHA256 297b3cf8606afc3332e0d0b0da707b306f8cec6f8f9a962a04181caee9bbf27e SHA512 742acde6316d5fe0cda1cb7be86812ad79bad9b5402e3b7d3d29f22afce3222d14fa8fe5a41d9cb2f3a3745f6a7ca5db3395873a5dee3e55c661fc01bfa3b007 WHIRLPOOL a54572e85e160fb7dda5eeb3ef2e5c4aca9c4e5a390321112783cfad1e40100d37eb0d763d92d3335a4ffab50bb562ce7f8138b9bc4a5722ddbd115f625baad1
diff --git a/dev-python/cytoolz/cytoolz-0.7.1.ebuild b/dev-python/cytoolz/cytoolz-0.7.1.ebuild
new file mode 100644
index 000000000000..d86ab4b9b1ac
--- /dev/null
+++ b/dev-python/cytoolz/cytoolz-0.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cytoolz/cytoolz-0.7.1.ebuild,v 1.1 2014/12/24 08:36:08 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
+HOMEPAGE="https://pypi.python.org/pypi/cytoolz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_compile() {
+ python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+ distutils-r1_python_compile
+}
diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
index 9e4d8b1aa14b..ddea853013a5 100644
--- a/dev-python/datashape/Manifest
+++ b/dev-python/datashape/Manifest
@@ -1 +1,2 @@
DIST datashape-0.4.1.tar.gz 76873 SHA256 cc72f5feec393890183c82c2d0da55cf3e1e8334909ae71bd6aa5c119961b89b SHA512 dd74aa6d001de5122e155d94b50aeaebbc1e3c1ced19166158d2a9860f2e553d17d0c81a45d81130816ab0406c030f2f7cefbbe7f8543e7b57df338d731af493 WHIRLPOOL 851823fa36955bbedcefc866462ca90ae3bd00e78d32ed5875a83c5ecba7b18ac73457835ddb5e1fb4e093419c008431f1f5b4a54cae284dff8a317b5d0a95ec
+DIST datashape-0.4.2.tar.gz 79106 SHA256 56ca27c5eb090d3670d3f59d2cd4a9855c488495fd1888e6f723a21f42acfa32 SHA512 d12eecdce6ffeb77d9367fcf978c2cfddea3bd2daa53a2aea983464c41ff2a408f9d199462ed25eebf247f4bb0f9e827ac97a5acab19979a5d30789898441c49 WHIRLPOOL 5497a90258115e8db30414ab1bedbad88d38462e6606561c9be7645137557608ac12a384e93da08f3e2cb49c1ffbb5a3b5d33483376ee8f170cfe6af10a9dc32
diff --git a/dev-python/datashape/datashape-0.4.2.ebuild b/dev-python/datashape/datashape-0.4.2.ebuild
new file mode 100644
index 000000000000..6172a33dd237
--- /dev/null
+++ b/dev-python/datashape/datashape-0.4.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.2.ebuild,v 1.1 2014/12/24 08:40:19 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Language defining a data description protocol"
+HOMEPAGE="https://github.com/ContinuumIO/datashape"
+SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/multipledispatch[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest
index 429aaa31bd0f..2613009e7963 100644
--- a/dev-python/django-nose/Manifest
+++ b/dev-python/django-nose/Manifest
@@ -1,2 +1,2 @@
-DIST django-nose-1.1.tar.gz 28185 SHA256 6c832c892d9a0b7c44b5f435de98bc75cd76b58534c519bd9f92c94a988c5bd2 SHA512 82f876df87a27051163c0f143b9ebc3d0c460cf1398c4315a9a1eb73d7eb18863cb8b12c7efb2c9dbc849285a26395c69b91525967351ef565974f0bafc6f248 WHIRLPOOL 97be1c84b359dc5c6a0936599d35030d5bb8de197fe1ba976687a64e789cbccdf588a764cb60f1e41db96206a1fc83cbb7674fe12b4596818e7256b17f5976d2
DIST django-nose-1.2.tar.gz 24560 SHA256 9aae16b562866a4ddaa5e8978729abadbbed544728d88e0b9c9af7b31dd072ed SHA512 ff0b683d160240a72009c2f969069bfc8ca08bf0c5ac586c2c62fbced776f951c2a6565e71b5fa87e1219e2096483292e933736059d327e06a0a748125398e0c WHIRLPOOL 2707bc9a2a26ced62db77673888259fc9e783bdcae5b6c2fdc8ae54ed0f4e7a11f44a43e9212e0e58761afa29d919a6093f06e10a8ba8a703c40d63e3ff26392
+DIST django-nose-1.3.tar.gz 25149 SHA256 3667d26a41fec30364a0ef72580832ca5328802d553f6d6e72af5ac21cb36365 SHA512 0e7f18d32340f912fcde96c3ed4ff63caec71ad178f9bd01e61087a228d7e93ecfd87c5d320a66093bce438561638daacd586a4ecb3198573b28607d33eb853f WHIRLPOOL 0acbbe147c0e434ef641843d10f9781ef26f3dc428ba8e613165ed43d6f5d1dea27bf513d9efcbd551c38c7a1945ae3b06aafb0a6d01c8714479f0c4836f1863
diff --git a/dev-python/django-nose/django-nose-1.1-r1.ebuild b/dev-python/django-nose/django-nose-1.1-r1.ebuild
deleted file mode 100644
index 70e4b8883d73..000000000000
--- a/dev-python/django-nose/django-nose-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-nose/django-nose-1.1-r1.ebuild,v 1.1 2013/05/19 10:18:07 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django test runner that uses nose"
-HOMEPAGE="https://github.com/jbalogh/django-nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=dev-python/nose-1.0[${PYTHON_USEDEP}]
- >=dev-python/django-1.2[${PYTHON_USEDEP}]
- >=dev-python/south-0.7[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- "${PYTHON}" testapp/runtests.py
-}
diff --git a/dev-python/django-nose/django-nose-1.2.ebuild b/dev-python/django-nose/django-nose-1.3.ebuild
similarity index 58%
rename from dev-python/django-nose/django-nose-1.2.ebuild
rename to dev-python/django-nose/django-nose-1.3.ebuild
index 5e801f3b9275..6d3a4f8df34b 100644
--- a/dev-python/django-nose/django-nose-1.2.ebuild
+++ b/dev-python/django-nose/django-nose-1.3.ebuild
@@ -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/django-nose/django-nose-1.2.ebuild,v 1.2 2014/04/09 06:14:18 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-nose/django-nose-1.3.ebuild,v 1.1 2014/12/24 09:17:07 idella4 Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1
@@ -14,14 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=dev-python/nose-1.0[${PYTHON_USEDEP}]
- >=dev-python/django-1.2[${PYTHON_USEDEP}]
- >=dev-python/south-0.7[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
+ dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ >=dev-python/south-0.7[${PYTHON_USEDEP}] )"
python_test() {
"${PYTHON}" testapp/runtests.py
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
index 89570f862420..b196e7f3be8e 100644
--- a/dev-python/egenix-mx-base/Manifest
+++ b/dev-python/egenix-mx-base/Manifest
@@ -1,2 +1,3 @@
DIST egenix-mx-base-3.2.4.tar.gz 4574057 SHA256 bfbb9519994c33e470d58b0c7b8167e25ce7a1bbf24f2533ea1e1cc235c570f0 SHA512 53bfb3c6d3605cb1da14b380bc53351fd2fc3aa3458f07a03d61d2551a9b8062ae6523546db655e8898120cac8548236bf903c2fac9a5446b0940fe281b5467e WHIRLPOOL 4ad47ffbd8a2bb97f28e1aa78cce016c611046f0082ba75b4bf9d5af3d11be489bda64587dafae740863bf2768e52413df5aa4a068a44e5b8620be9999b9489e
+DIST egenix-mx-base-3.2.5.tar.gz 4575752 SHA256 bfd0d2aeef73532697c857db26ea11a3574280b1d439d42501c36b4c1d989dce SHA512 707d4cb96de04f967c1a37d156f41d9570b580088132f96533b7b4319c1fc0492a29b01ce1dba9527d7fc7cada99da8767a55c0994c285af81af82fd0f370a42 WHIRLPOOL 6f1a190c3d3dad516b58005815fb283c74cba6a3bb87a9f4dfe1f1bb18789ef8731af8e151e1e855feb0338734ea6232c984d259836607bafa3ddbeb0956887f
DIST egenix-mx-base-3.2.8.tar.gz 4597088 SHA256 0da55233e45bc3f88870e62e60a79c2c86bad4098b8128343fd7be877f44a3c0 SHA512 26a8d53c2a8ccfe088ac201d0b50d9becc402220746dae2f4fe67b55a1c0cff29b6b7f635f689752c4d444bb05b5edc30972354301830ae24e13b845596dcff9 WHIRLPOOL caba8296c996dc847b0039d5b088f3ddf8e2fae36af1bdb563ca705bf39d6d00aed490c785e303bce9cb79c425f2ca32a244e6f8cfdfdf529548fe2ddd1e3d39
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
new file mode 100644
index 000000000000..9177a1c94947
--- /dev/null
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild,v 1.7 2014/12/24 11:58:26 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="eGenix utils for Python"
+HOMEPAGE="http://www.egenix.com/products/python/mxBase http://pypi.python.org/pypi/egenix-mx-base"
+SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
+
+LICENSE="eGenixPublic-1.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+# distutils.command.config writes to CWD, bug #450516
+# mxSetup.py is broken with --build-lib
+#DISTUTILS_IN_SOURCE_BUILD=1
+DISTUTILS_NO_PARALLEL_BUILD=1
+
+python_prepare_all() {
+ # Don't install documentation in site-packages directories.
+ sed -e "/\.pdf/d" -i egenix_mx_base.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local t
+
+ while IFS= read -r -d '' t
+ do
+ "${PYTHON}" "${t}" || die "${t} failed with ${EPYTHON}"
+ done < <(find -name test.py -print0)
+}
+
+python_install() {
+ local f dest=${D}$(python_get_includedir)/mx
+
+ distutils-r1_python_install \
+ build --build-platlib "${BUILD_DIR}"/lib
+
+ mkdir -p "${dest}" || die
+ while IFS= read -r -d '' f
+ do
+ mv -f "${f}" "${dest}" || die
+ done < <(find "${D}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
+}
+
+python_install_all() {
+ local f
+
+ distutils-r1_python_install_all
+
+ dohtml -a html -r mx
+ while IFS= read -r -d '' f
+ do
+ dodoc "${f}"
+ done < <(find -name '*.pdf' -print0)
+}
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
index 41175eea1bf9..af0a5a334887 100644
--- a/dev-python/enum34/Manifest
+++ b/dev-python/enum34/Manifest
@@ -1 +1,2 @@
+DIST enum34-1.0.4.tar.gz 32944 SHA256 d3c19f26a6a34629c18c775f59dfc5dd595764c722b57a2da56ebfb69b94e447 SHA512 21b91f1d0e15cc909e733473f603077eff7222c90da84b0a5f2db921ba41ac996b9237cc8adf1d07913b7eaf8f8e70ac6955abbb191f2e7cc54966710a1c96a9 WHIRLPOOL 178d1d5a9ec4e5a7a467e31c9b28e1f799e593e36a0c9a888f64ec86051277cb1c50ae01ed81c95cd3f7ae1e7f287dda9b4049c7e1977fcd427711fcf3990792
DIST enum34-1.0.tar.gz 32331 SHA256 384b593703b057e0b19d90ff62844b1c8796da2e6bd9957d6ce9119bdeade635 SHA512 8eefcb42449927e419c87016d534b1fb335a85daa49c7ae3cc4549bc92dbb6d1a02158542a8cba1fbff4bbad2c4830c6f465b13e8d5ec6d2aae5752efecdf1d3 WHIRLPOOL 28b02767afe416404ba9d0c4db972c869383a72cfc6cb1a75f93b01e2636bac139743f5acb2dbe06083c655a1854cfb8a3c7f1ce1eba340a38d457e3e71e63b3
diff --git a/dev-python/enum34/enum34-1.0.4.ebuild b/dev-python/enum34/enum34-1.0.4.ebuild
new file mode 100644
index 000000000000..c87b0b6c31e7
--- /dev/null
+++ b/dev-python/enum34/enum34-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/enum34-1.0.4.ebuild,v 1.2 2014/12/24 03:28:28 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 pypy ) # Do NOT add python3_4—see DESCRIPTION
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3.4 Enum backported"
+HOMEPAGE="https://pypi.python.org/pypi/enum34"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+python_test() {
+ "${PYTHON}" enum/test_enum.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local DOCS=( enum/doc/. enum/README enum/LICENSE )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/enum34/enum34-1.0.ebuild b/dev-python/enum34/enum34-1.0.ebuild
index e418237a7322..8a8fee73bc98 100644
--- a/dev-python/enum34/enum34-1.0.ebuild
+++ b/dev-python/enum34/enum34-1.0.ebuild
@@ -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/enum34/enum34-1.0.ebuild,v 1.3 2014/12/19 03:17:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/enum34-1.0.ebuild,v 1.4 2014/12/24 03:28:28 idella4 Exp $
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python{3_3,3_4} pypy pypy3 )
inherit distutils-r1
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index 4eac05fc2d78..39db9b6bc10d 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -1,2 +1 @@
-DIST geopy-1.3.0.tar.gz 54230 SHA256 e9b7a4ff4ad58041d731aa5fe391316fc4e0a6c1de83599af0bca70342b276d4 SHA512 c4078288d96b7f6387de4a0f7b0089fb7aa7706881c951a7a5285613553eaec3bae996dddf2bab78961aa674bad696f951a0f871bd9b8646a1de52b7d14b975d WHIRLPOOL 73b2fc4c8e56935b596356d7343c6e629e8222b0be59dae4daae545ce1f76c08fbc0e3599be05f3dcd484b6af4cc4631c5cf70528fd11295a44459933b3f4c09
-DIST geopy-1.4.0.tar.gz 54768 SHA256 9f4824543e9a29937ffc10fd0ed17f43c63e8254ca58281a0496d3ed2eefa350 SHA512 3d3c29c2fbbe20ad65c0fd83715ada0c962cba9027aeeb6080f968fcf3523b22d64c9967033027b427fe47c60c956a88a2c4649524aa8512ce9c143787e94b26 WHIRLPOOL 1b9e1ec098f381fbc77a159240aeb0facdde0ca3236c98a7d4ef84871085c79c4a0370edd81561b117b077d72dad5e9644bba566b235ced553577cbdd8d279e7
+DIST geopy-1.6.1.tar.gz 58347 SHA256 0853b9277d31efc31557b2d7bab59c87171574ec5cb72b655b990eb2336a4e58 SHA512 4f2cf6ab57ff99eddbbb876cd69921d1bcd4ad56f6b7f29cbee7bbe9e0a9955f2b2c5f2ec9f2c2b3b6bf20df55aba09d2672ff05fc5887180e06f8f5150ece1c WHIRLPOOL 03800b4d2f2f135564d4be07b975e80445096c689d623e69b558b737527485da016f72bec11bd6e2c2cb53abaf09925ea0b72db2a8512606c2d1dfc6c2090eca
diff --git a/dev-python/geopy/geopy-1.4.0.ebuild b/dev-python/geopy/geopy-1.4.0.ebuild
deleted file mode 100644
index 2d4612941f3b..000000000000
--- a/dev-python/geopy/geopy-1.4.0.ebuild
+++ /dev/null
@@ -1,58 +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/geopy/geopy-1.4.0.ebuild,v 1.1 2014/11/17 06:34:56 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Geocoding Toolbox for Python"
-HOMEPAGE="http://www.geopy.org/ https://github.com/geopy/geopy"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE="test doc yahoo"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
- dev-python/placefinder[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}]
- dev-python/nose-cover3[${PYTHON_USEDEP}]
- dev-python/pylint[${PYTHON_USEDEP}] )
- doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
- >=dev-python/python-docs-2.7.6-r1:2.7 )"
-
-python_prepare_all() {
- if use doc; then
- local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
- local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
- local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
- local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
- sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
- fi
-
- distutils-r1_python_prepare_all
-
- # purge test folder to avoid file collisions
- sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
-}
-
-python_test() {
- # intermittent fails or errors caused by an apparent race condition. suite is fine
- # The setting --processes=-1 invokes this flaw
- nosetests || die "Tests failed under ${EPYTHON}"
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/geopy/geopy-1.3.0-r1.ebuild b/dev-python/geopy/geopy-1.6.1.ebuild
similarity index 87%
rename from dev-python/geopy/geopy-1.3.0-r1.ebuild
rename to dev-python/geopy/geopy-1.6.1.ebuild
index 36f65225d274..10bbbc656e32 100644
--- a/dev-python/geopy/geopy-1.3.0-r1.ebuild
+++ b/dev-python/geopy/geopy-1.6.1.ebuild
@@ -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/geopy/geopy-1.3.0-r1.ebuild,v 1.1 2014/10/04 03:02:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-1.6.1.ebuild,v 1.1 2014/12/24 10:32:18 idella4 Exp $
EAPI=5
@@ -44,8 +44,8 @@ python_prepare_all() {
python_test() {
# intermittent fails or errors caused by an apparent race condition. suite is fine
- # The setting --processes=-1 invokes this flaw
- nosetests || die "Tests failed under ${EPYTHON}"
+ # test test_geocode attempts to connect the network and is excluded here
+ nosetests -e test_geocode || die "Tests failed under ${EPYTHON}"
}
python_compile_all() {
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index 5987636cfad8..7503eacef4f6 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -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/iso8601/iso8601-0.1.10.ebuild,v 1.12 2014/12/09 10:18:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.10.ebuild,v 1.13 2014/12/24 07:26:32 maekke Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index c56efb93849f..1317e76fb3a0 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,2 +1 @@
-DIST jsonpointer-1.5.tar.gz 8221 SHA256 8f26c526cd6a8f211d68abb77ce4bfaf73d3ba17953e1c1164c10a4a2de09d68 SHA512 1b2e74770d98ab051858dab3ec0c1b81389bb6d406f54f4b7baa1fb99888d0e8ef5d5351cbc88c117603cab7b0755a607c99940320bd77a346cb273ed9202c1b WHIRLPOOL 4e898fd0158ada58d6ffc8594cda352a9e283e37ff49c5601baf1a6643ade933b7dc14363dc957a85313e9c3ad1f4a9d725196ac30893d85a54d0c1874212a19
-DIST jsonpointer-1.6.tar.gz 8266 SHA256 498ee1ac122b38e117c98767be34e0bda6489aafee04452f87225be00dff6ebc SHA512 691ab59029f59719f76a4a183d3eadfd2f7a4ea615de04778c6feb68351c61b2279e633622ae4bd2009497e128875562b5d42f463c5eef1b56f6d4b074256d0c WHIRLPOOL 4488f61faccb638eead2f2621209856054311e1061c68b42f058616b228b4a8f235955a4ba77355873b47c8c2931510b254f16b436719fb26c956102769c61a9
+DIST jsonpointer-1.7.tar.gz 8187 SHA256 46b2016b5e4f2b5cd2edf07c60ca8fe7dd91204ca848f98964be61b3c4760f5e SHA512 26b25f31fb98fe7c7d926dcc492fe7889f2462430f959645e498fc47367d23243fb3b528da7af026827dffb30d7c5fe2ffb31843a8f2c9064647bebb313de9bb WHIRLPOOL 8539c4bb40cb2c1042f76d91e127da31d742ea55f8b2ba51abcc0e2d3319bf2ab2380e3ee2cd4195d8cc563b2d36a1eff56a6e72e2f3a8c171692bb66bfa3558
diff --git a/dev-python/jsonpointer/jsonpointer-1.6.ebuild b/dev-python/jsonpointer/jsonpointer-1.6.ebuild
deleted file mode 100644
index 34f43d89998b..000000000000
--- a/dev-python/jsonpointer/jsonpointer-1.6.ebuild
+++ /dev/null
@@ -1,24 +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/jsonpointer/jsonpointer-1.6.ebuild,v 1.1 2014/12/08 05:38:17 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
-HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.python.org/pypi/jsonpointer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
- "${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpointer/jsonpointer-1.5.ebuild b/dev-python/jsonpointer/jsonpointer-1.7.ebuild
similarity index 92%
rename from dev-python/jsonpointer/jsonpointer-1.5.ebuild
rename to dev-python/jsonpointer/jsonpointer-1.7.ebuild
index e051c627697c..c0c46ce48c8a 100644
--- a/dev-python/jsonpointer/jsonpointer-1.5.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-1.7.ebuild
@@ -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/jsonpointer/jsonpointer-1.5.ebuild,v 1.2 2014/12/08 05:38:17 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpointer/jsonpointer-1.7.ebuild,v 1.1 2014/12/24 10:56:55 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index ebbeb396b9cd..0e42da796177 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,3 +1,2 @@
DIST libvirt-python-1.2.10.tar.gz 162075 SHA256 fd38d589da34de523756e2b39980453bd1149fe162d109fbb7cf65df0c250ba7 SHA512 faec1209c2d1ce170225677cc0080d60c39dcc3ef6bf1e50ccf347519e051490cf4a019fe4a15e32e9de2e137f70904dabc3d288b44bb00c5de465ffc2104837 WHIRLPOOL a3b192bbef5b24ab00d9a9565cfc04972b6b4d5288fc9ac5077232b23d2bb54424a147b789b8b230299f7ac68af8c78febd84dc5db97a007680202de97006a61
DIST libvirt-python-1.2.11.tar.gz 163854 SHA256 4a526f5d847cee6ef7efcebac1ea18e18a3164fc77704aba948429be88ad7d5e SHA512 f3768ae9d5ee2bda68611d60712b25b653a0f24d961de8757d9f52c4617e2920dcd6ffbcdecefe60f3d29b9466f78b98a2609c00aafe4e1d7fe49f0a7135f1a0 WHIRLPOOL cf92d662383490e24b6e0eb5322e81079a49e575d12054c7bfc2a94c6906549293c5e2fe50f15ba1f5942bea34d4e674c72b53d27b1bd6fb65358a6a19c96bdb
-DIST libvirt-python-1.2.9.tar.gz 160357 SHA256 8f7023ae93aecc6981e07f88fd47bcec1b2bdef52c37c2db8acfb1ad379f79ed SHA512 be7741e8fbc66d32d9df84f493cde18185783a6d91395df1d82bd4e33cf1cbed657f681f3bccc1d87df77181896e173f84124af243318fc8a5b63f7172dde527 WHIRLPOOL d0043bd6df456d3fa79bb01a757c062db81b1c8ac9d7d840522617f645804123790235797a210fe2604bcd726f5175a8c1748160e0834e7f511fbc9077c45e1a
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.10.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.10.ebuild
index 43a29c557da2..40513a199675 100644
--- a/dev-python/libvirt-python/libvirt-python-1.2.10.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-1.2.10.ebuild
@@ -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/libvirt-python/libvirt-python-1.2.10.ebuild,v 1.6 2014/12/13 12:52:24 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libvirt-python/libvirt-python-1.2.10.ebuild,v 1.8 2014/12/24 13:19:18 ago Exp $
EAPI=5
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
RDEPEND="app-emulation/libvirt:=[-python(-)]"
else
SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
RDEPEND="app-emulation/libvirt:0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.9.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.9.ebuild
deleted file mode 100644
index 74d244d3d672..000000000000
--- a/dev-python/libvirt-python/libvirt-python-1.2.9.ebuild
+++ /dev/null
@@ -1,43 +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/libvirt-python/libvirt-python-1.2.9.ebuild,v 1.3 2014/10/27 14:17:55 ago Exp $
-
-EAPI=5
-
-#BACKPORTS=062ad8b2
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="http://www.libvirt.org"
-SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz
- ${BACKPORTS:+
- http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND=">=app-emulation/libvirt-0.9.6:=[-python(-)]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-python/lxml )"
-
-S="${WORKDIR}/${P%_rc*}"
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/paramiko/paramiko-1.15.1-r1.ebuild b/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
index b7527b5f9e27..de8970e8f225 100644
--- a/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
+++ b/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
@@ -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/paramiko/paramiko-1.15.1-r1.ebuild,v 1.2 2014/12/19 07:33:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.15.1-r1.ebuild,v 1.3 2014/12/24 07:28:32 maekke Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/pbr/pbr-0.8.2.ebuild b/dev-python/pbr/pbr-0.8.2.ebuild
index 8fac8bfc8d17..e5ee780fba70 100644
--- a/dev-python/pbr/pbr-0.8.2.ebuild
+++ b/dev-python/pbr/pbr-0.8.2.ebuild
@@ -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/pbr/pbr-0.8.2.ebuild,v 1.2 2014/08/20 20:37:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.2.ebuild,v 1.3 2014/12/23 21:24:50 floppym Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 0e9dc0144068..04e04496d180 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,2 +1,3 @@
DIST pip-1.5.6.tar.gz 938120 SHA256 b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c SHA512 cecd1da900e95bf3e6164e6d0c8c989e8ce17ef892beb9581a567857fe69dd3490b45d366cbb8e3bc84cebcf62ecf34420bcc1fae3fd8cf448927438ae257b68 WHIRLPOOL d6b77000ec465f8ba15db9dd4ce23c491937d5c7ee8fa148cf1cc88d59e972ad0a4a86adeca0d6b5227e97e83c16ae6d14b76976b605db572c08ac7019a02e6d
DIST pip-6.0.2.tar.gz 1191608 SHA256 6fa90667706a679e3dc75b27a51fddafa64401c45e96f8ae6c20978183290077 SHA512 12700739af2e21fd1cd9ad4c4d7f6cbbacd00b8c9fcf993b320ddbd4ced0ea9cc147db0f4b7ac8dfc3343115e18d947b21f074c6446393d68887dcfe782f89d1 WHIRLPOOL 778e2e1afa10c9d67812f79cbc956e6f1fa929119357d4441eb3e123ea38fec36564982ac9c63e4eee6d9c7866fcedf7e0e8c1d20b844268298ae8e54acec5bb
+DIST pip-6.0.3.tar.gz 1191776 SHA256 b091a35f5fa0faffac0b27b97e1e1e93ffe63b463c2ea8dbde0c1fb987933614 SHA512 659248cb9912d571ada5fb58287d84a82f8fc1126b4063ba75874ccf807f987c7208de3e69f7b67a5030cb12109964c7ab448b28ade090f584066fa47202f8bd WHIRLPOOL 3564dcad140a81570b770f162959b96bf7d010c6b6faf57b586054981a10fd0c35f04efa044366b2eb78484f9155c767385cbc2808ee9a037343efef1007c54f
diff --git a/dev-python/pip/pip-1.5.6.ebuild b/dev-python/pip/pip-1.5.6.ebuild
index d451714294c9..489ff0844e42 100644
--- a/dev-python/pip/pip-1.5.6.ebuild
+++ b/dev-python/pip/pip-1.5.6.ebuild
@@ -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/pip/pip-1.5.6.ebuild,v 1.7 2014/12/05 10:16:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.5.6.ebuild,v 1.8 2014/12/23 21:21:51 floppym Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE=""
diff --git a/dev-python/pip/pip-6.0.2.ebuild b/dev-python/pip/pip-6.0.2.ebuild
index 08d20b1d207e..5d211c3c1429 100644
--- a/dev-python/pip/pip-6.0.2.ebuild
+++ b/dev-python/pip/pip-6.0.2.ebuild
@@ -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/pip/pip-6.0.2.ebuild,v 1.1 2014/12/23 16:44:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-6.0.2.ebuild,v 1.2 2014/12/23 21:21:51 floppym Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE=""
diff --git a/dev-python/pip/pip-6.0.3.ebuild b/dev-python/pip/pip-6.0.3.ebuild
new file mode 100644
index 000000000000..46b9948e4b30
--- /dev/null
+++ b/dev-python/pip/pip-6.0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-6.0.3.ebuild,v 1.1 2014/12/24 04:10:37 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+# required test data isn't bundled with the tarball
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch )
+
+python_install_all() {
+ local DOCS=( AUTHORS.txt docs/*.rst )
+ distutils-r1_python_install_all
+
+ COMPLETION="${T}"/completion.tmp
+
+ ${EPYTHON} pip/__init__.py completion --bash > "${COMPLETION}" || die
+ newbashcomp "${COMPLETION}" ${PN}
+
+ ${EPYTHON} pip/__init__.py completion --zsh > "${COMPLETION}" || die
+ insinto /usr/share/zsh/site-functions
+ newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
index c14f80a318e9..069d9761b996 100644
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ b/dev-python/pretend/pretend-1.0.8.ebuild
@@ -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/pretend/pretend-1.0.8.ebuild,v 1.7 2014/12/09 10:19:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pretend/pretend-1.0.8.ebuild,v 1.8 2014/12/24 07:27:00 maekke Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopenssl/pyopenssl-0.14.ebuild b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
index c3dfe3e55549..c49543c76d47 100644
--- a/dev-python/pyopenssl/pyopenssl-0.14.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
@@ -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/pyopenssl/pyopenssl-0.14.ebuild,v 1.16 2014/12/09 10:23:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.14.ebuild,v 1.17 2014/12/24 07:28:15 maekke Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
index 7eede0643661..feca6569cb86 100644
--- a/dev-python/pypy-bin/metadata.xml
+++ b/dev-python/pypy-bin/metadata.xml
@@ -2,11 +2,9 @@
python
- proxy-maintainers
- alice.ferrazzi@gmail.com
+ alicef@gentoo.org
Alice Ferrazzi
- Proxy maintainer
diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
new file mode 100644
index 000000000000..a69f36357f91
--- /dev/null
+++ b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/stumpwm/stumpwm-0.9.9.ebuild,v 1.2 2014/12/24 12:04:04 ulm Exp $
+
+EAPI=5
+
+inherit common-lisp-3 eutils elisp-common autotools
+
+DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp."
+HOMEPAGE="http://www.nongnu.org/stumpwm/"
+SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc clisp ecl +sbcl emacs"
+
+RESTRICT="strip mirror"
+
+RDEPEND="dev-lisp/cl-ppcre
+ sbcl? ( >=dev-lisp/clx-0.7.4 )
+ !sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) )
+ !sbcl? ( !clisp? ( ecl? ( >=dev-lisp/ecls-10.4.1 ) ) )
+ !sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) )
+ sbcl? ( >=dev-lisp/sbcl-1.0.32 )
+ emacs? ( virtual/emacs app-emacs/slime )"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo
+ doc? ( virtual/texi2dvi )"
+
+SITEFILE=70${PN}-gentoo.el
+
+get_lisp() {
+ local lisp
+ for lisp in "$@" ; do
+ use ${lisp} && echo ${lisp} && return
+ done
+}
+
+do_doc() {
+ local pdffile="${PN}.pdf"
+
+ texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
+ cp "${FILESDIR}"/README.Gentoo . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
+ dodoc AUTHORS NEWS README.md README.Gentoo
+ doinfo ${PN}.info
+ docinto examples ; dodoc sample-stumpwmrc.lisp
+}
+
+src_prepare() {
+ # Upstream didn't change the version before packaging
+ sed -i "${S}/${PN}.asd" -e 's/:version "0.9.8"/:version "0.9.9"/' || die
+ eautoreconf
+ econf --with-lisp=$(get_lisp sbcl clisp ecl)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ common-lisp-export-impl-args $(get_lisp sbcl clisp ecl)
+ dobin stumpwm
+ make_session_desktop StumpWM /usr/bin/stumpwm
+
+ common-lisp-install-sources *.lisp
+ common-lisp-install-asdf ${PN}.asd
+ use doc && do_doc
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/x11-wm/stumpwm/stumpwm-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild
new file mode 100644
index 000000000000..c8a4410b5087
--- /dev/null
+++ b/x11-wm/stumpwm/stumpwm-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/stumpwm/stumpwm-9999.ebuild,v 1.1 2014/12/23 22:28:11 nimiux Exp $
+
+EAPI=5
+
+inherit autotools common-lisp-3 git-2
+
+DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp."
+HOMEPAGE="http://www.nongnu.org/stumpwm/index.html"
+EGIT_REPO_URI="git://github.com/stumpwm/stumpwm"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc clisp emacs +sbcl"
+
+DEPEND="dev-lisp/common-lisp-controller
+ virtual/commonlisp
+ dev-lisp/cl-ppcre
+ doc? ( virtual/texi2dvi )"
+
+RDEPEND="${DEPEND}
+ emacs? ( app-emacs/slime )
+ !clisp? ( !sbcl? ( !amd64? ( dev-lisp/cmucl ) ) )
+ clisp? ( >=dev-lisp/clisp-2.38-r2[X,-new-clx] )
+ sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx )"
+
+do_doc() {
+ local pdffile="${PN}.pdf"
+
+ dodoc AUTHORS NEWS README.md
+ texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
+}
+
+src_prepare() {
+ eautoreconf
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ common-lisp-install-sources *.lisp
+ common-lisp-install-asdf
+ dobin "${PN}"
+ use doc && do_doc
+}