Sync with portage [Wed Feb 12 21:43:20 MSK 2014].

mhiretskiy
root 10 years ago
parent c592ed5671
commit 6a5b93ef28

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/verynice/verynice-1.1-r2.ebuild,v 1.1 2014/01/03 21:55:18 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/verynice/verynice-1.1-r2.ebuild,v 1.2 2014/02/11 14:28:40 nimiux Exp $
EAPI=5
@ -12,7 +12,7 @@ SRC_URI="http://thermal.cnde.iastate.edu/~sdh4/verynice/down/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
S=${WORKDIR}/${PN}

@ -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-arch/cpio/cpio-2.11-r1.ebuild,v 1.5 2014/02/09 23:22:03 nimiux Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11-r1.ebuild,v 1.6 2014/02/11 15:00:55 hattya Exp $
EAPI="4"
@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
src_prepare() {

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-3.0.3.ebuild,v 1.1 2013/09/13 06:48:31 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-3.0.3.ebuild,v 1.2 2014/02/11 18:43:52 jer Exp $
EAPI=4
@ -13,7 +13,7 @@ HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
SRC_URI="http://www.joedog.org/pub/siege/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
KEYWORDS="~amd64 hppa ~mips ~ppc ~x86"
SLOT="0"
IUSE="ssl"

@ -1,3 +1,2 @@
DIST bongo-20090713.tar.bz2 97704 SHA256 eff4c430d29e5dddea5824b826229ba1ba33978a6b73d782a564edb9539d01f3 SHA512 fc90f274227fac8f2305a5e39174824ab9ba66bc4ae9ded3313892c93c1b118183ae40a5f9bfb5cbf2157b43efeb78c6ca3ed2fd5af3a8bdddf6a39a597f31d6 WHIRLPOOL 67312cf65b49444af171f7362c82109354b9f3d01fcd6652688d3757968fd731311fa99e9a5470a18d87587dc0c48e70fa0eac1f2f020f016386f2f8d3610bec
DIST bongo-20110621.tar.xz 97652 SHA256 0fa7603d8239351725c6abe37ca8781a221821defb081c329620ed4dcc2a5cfe SHA512 31c2a477cfb5ff36fbc64da29c725db0b0242ea09f80883fb21feb3b23f5c14c688379c4c4e53b26ffef3aca5d2813d5b2a38b91266da088c73516f7ea1d712b WHIRLPOOL 29fa53b77626cf0c8dc79bbdea16912dbb12ddb8cdcd344f98ecef5c20e480566aa6792341739efd08a600a0c5ef09b0fdb7c679aaf520f66845af3ca83a7adb
DIST bongo-mplayer-20070204.tar.bz2 3563 SHA256 a80aa2c3c6def4e679094817ca9db3c0766811f094766ee4b399eec93c062ec9 SHA512 e503ed7980f011a6fc3fa75d0bb9b1cec1ed49d4fb07da92aad65e3c5096b42cf9eb203a8edbb93f2e7924254e4926e9f3fcf473de877fea130557aefad73ebd WHIRLPOOL 86ed787b8fa4909cbb89f24d17b524cc4b5d7c8d5e1d0c4ecac5289967176c599df58abc91c643f70f0c40cfbee573101641d7c53db35cd7521664fa22eaa93e

@ -1,53 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/bongo/bongo-20090713.ebuild,v 1.2 2013/04/05 18:58:32 ulm Exp $
NEED_EMACS=22
inherit elisp eutils
DESCRIPTION="Buffer-oriented media player for Emacs"
HOMEPAGE="http://www.brockman.se/software/bongo/"
# Darcs snapshot of http://www.brockman.se/software/bongo/
# MPlayer support from http://www.emacswiki.org/emacs/bongo-mplayer.el
SRC_URI="mirror://gentoo/${P}.tar.bz2
mplayer? ( mirror://gentoo/${PN}-mplayer-20070204.tar.bz2 )"
LICENSE="GPL-2+ FDL-1.2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="mplayer taglib"
# NOTE: Bongo can use almost anything for playing media files, therefore
# the dependency possibilities are so broad that we refrain from including
# any media players explicitly in DEPEND/RDEPEND.
DEPEND="app-emacs/volume"
RDEPEND="${DEPEND}
taglib? ( dev-ruby/ruby-taglib )"
S="${WORKDIR}/${PN}"
DOCS="NEWS README"
ELISP_TEXINFO="${PN}.texinfo"
SITEFILE="50${PN}-gentoo.el"
src_unpack() {
unpack ${A}
cd "${S}"
# We need Emacs 22 for image-load-path anyway, so don't bother with 21.
rm -f bongo-emacs21.el
epatch "${FILESDIR}/${PN}-20070619-fix-require.patch"
}
src_install() {
elisp_src_install
insinto "${SITEETC}/${PN}"
doins *.pbm *.png || die "doins failed"
if use taglib; then
dobin tree-from-tags.rb || die "dobin failed"
fi
}

@ -1,6 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/bubblet/bubblet-0.74-r1.ebuild,v 1.4 2008/12/18 21:43:57 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/bubblet/bubblet-0.74-r1.ebuild,v 1.5 2014/02/12 09:01:07 ulm Exp $
EAPI=5
inherit elisp
@ -8,9 +10,8 @@ DESCRIPTION="A bubble-popping game"
HOMEPAGE="http://web.archive.org/web/20051217154122/www.gelatinous.com/pld/bubblet.html"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
SITEFILE=51${PN}-gentoo.el
SITEFILE="50${PN}-gentoo.el"

@ -1,5 +1,2 @@
;;; bubblet site-lisp configuration
(add-to-list 'load-path "@SITELISP@")
(autoload 'bubblet "bubblet" "Start a new Bubblet game." t)

@ -1,6 +1,8 @@
# 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/app-emacs/fff/fff-20050517.ebuild,v 1.7 2010/12/18 17:19:14 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/fff/fff-20050517.ebuild,v 1.8 2014/02/12 08:00:39 ulm Exp $
EAPI=5
inherit elisp
@ -8,10 +10,9 @@ DESCRIPTION="Fast file finder for Emacs"
HOMEPAGE="http://www.splode.com/~friedman/software/emacs-lisp/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="sys-apps/mlocate"

@ -1,6 +1,3 @@
;;; fff site-lisp configuration
(add-to-list 'load-path "@SITELISP@")
(autoload 'fff-find-file-in-envvar-path "fff" nil t)
(autoload 'fff-insert-file-in-envvar-path "fff" nil t)

@ -1,5 +1,4 @@
DIST org-6.36c.tar.gz 2706358 SHA256 26db6b9c319a2dd54f3a8da78f761594b7c8e7edeb9106f14a1c3a6ff94786a0 SHA512 81dfd13f4a3540bf8e6c3cd9a49f02882bb1aa20ac4ecc97beaa159bd8ab7ca4bf10bf5ca23c40619788f8999cee8ae6b0439d1d51b561197c24e6efd34f5d56 WHIRLPOOL 9c89b8508338553a05458bd9c532aaf951dd8803a755f432bd3136629e17e2244c06377b5516cee5cb04a69edd9301cdeafac70da1f3e83715d41643bf65dd2b
DIST org-7.9.2.tar.gz 4141885 SHA256 14c91bf456c271ac17f2f083f86227d4e5f09483fdb69adbf314de4392e25469 SHA512 9b0f90ec47660dcc9faf7ad742b62c816a031119a2a89864f6fd183e343bd08027f5cf8439314b1593b9f5d76ff08f57b0b30aa188e1a94a426b3573c33c434c WHIRLPOOL 3ac9a49157375cd3628c4fb1248af071d8ed725307effbcce81961bd1d35117ae7f5a371baffa6159e0c57fd4f896cdf4a7b0d3ac67942ea177d8717a19ce47f
DIST org-8.0.2.tar.gz 4171893 SHA256 e129bdb654c7e1cf7404cc55e65ff479712b1d9549ecdbb4f3904b4bff8c7034 SHA512 d1de4ac6a86449446e438a0f2edc98672144ab25721d4eb482ff1bc60122fded9775274d0ca7085d7ed6e98d972734bbd041970f65d8ed73db99f388dc41b2db WHIRLPOOL c51da4cd3b5697585d1f0ee08f8d782240d63395316ccc0570deefaec6944c384bb16963e3bfd3e495bbb8d5c003bfc7d388aa29d487d16da6a6eadb83858033
DIST org-8.2.1.tar.gz 4215666 SHA256 625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823 SHA512 366504c8bc4637c96d6255603e949951fed1d89b9b58aa938072c982cca14d5eedfa2a45aabbae55d4862aa9dcc984b379f969cf5b6da50f73d2e0044cd687fb WHIRLPOOL 024166ee4eb6bb994f44249ea819ac3b4aad9c133bfcbc438d57a4dce54b3c8a108519eabf9318e769768be36d1733066bbec58cfaf03fc600de72fd55e3c29d
DIST org-8.2.tar.gz 4216548 SHA256 88819e5bc15dd342523cbf26e4e9967bb67f6f206d96b609d9bf08d0730d1286 SHA512 4ef195d7cae62efb7f6c24dcf03395db147579c5d22a0403ac09c0bafbdccf2d5d9c0e5ae8e3500ba93d9610be202190468ff2e248fec1bd3ab3f3adca9a79a9 WHIRLPOOL 5fc724800828ace482c4dd064fc5cbb23e179dbc227af451f8d3fdf74ea21d544121bbe623fae7d75859b17f3b8a939598273d1cacc54d72cc2317103e78f4a9
DIST org-8.2.5h.tar.gz 4220242 SHA256 f0f4924c9d57557b12f535c032f5f8584cc27ab6af2afc9939f9acf1af2c5d80 SHA512 e486a6f831de935fbe9cbcff18042a5a5ff9ecb60ffd755455c70488f95c6c103f7870d7d69f9808043b2b87fe64441adfd5c9ddb417b33fd8f9469d1943db49 WHIRLPOOL 72290244aaabd09660fd290a100d8ae2ed05b64d3b842464f247c20c634a75e2738c07e85d414b852685f2fade0b2aea92a1a2835d178d90b7eab5650710066b

@ -1,39 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-6.36c.ebuild,v 1.9 2012/09/26 18:19:45 ulm Exp $
inherit elisp
DESCRIPTION="An Emacs mode for notes and project planning"
HOMEPAGE="http://www.orgmode.org/"
SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
LICENSE="GPL-3+ FDL-1.3+"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
IUSE=""
S="${WORKDIR}/org-${PV}"
SITEFILE="50${PN}-gentoo.el"
src_compile() {
# remove autoload file to make sure that it is regenerated with
# the right Emacs version
rm -f lisp/org-install.el
emake || die "emake failed"
}
src_install() {
emake \
prefix="${D}/usr" \
lispdir="${D}${SITELISP}/${PN}" \
infodir="${D}/usr/share/info" \
install || die "emake install failed"
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
mv doc/org doc/org.info
doinfo doc/org.info || die "doinfo failed"
dodoc README ChangeLog Changes.org doc/org.pdf doc/orgcard.pdf \
|| die "dodoc failed"
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.ebuild,v 1.1 2013/09/23 17:53:53 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.5h.ebuild,v 1.1 2014/02/12 08:44:27 ulm Exp $
EAPI=5
NEED_EMACS=23

@ -1,2 +1,2 @@
DIST gettext-0.18.1.1.tar.gz 15139737 SHA256 93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9 SHA512 1735599307a2d12be609ecfe1141815a11af144c6b94301f6c7101242e0b628251a3613d1d70df099ec07423befeaf10dfb53b8176f710c7e158c4fc63ea8747 WHIRLPOOL e14425df5b209d73e66a599ca13f67af68801fb76a6b0cce60f26f879402e0e26816ffb373d617ddc2b446600a3311fbf4527ffceccd4077f003dc687b821290
DIST gettext-0.18.3.1.tar.gz 16341773 SHA256 0d8f9a33531b77776b3dc473e7940019ca19bfca5b4c06db6e96065eeb07245d SHA512 b41f4ae5b5dc6459a9b87d6445c259ab8d8500fe760e4c5e6992245e96a1bf1b8ce424be82ff07bd67942301af7d9af4d2219643297e4baadfc8570ad9ab72cc WHIRLPOOL d3384bf5094a19ea799b82f4c3358183daf6382183849716ca5da824c18371230435668a336c9337a05a9975baa481728c6521adf80e6ed3575b329d26c99c24
DIST gettext-0.18.3.2.tar.gz 16189249 SHA256 d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7 SHA512 0cf8f2bb844b9d94f5e63a0f4bddc133e2388d103fd4189614d2fc157a94e27836ec399eb32ab69410e2214425676e6bc195bbf13238cc5ad32b454ec6e2b5ef WHIRLPOOL 0bb2e33788a12fbeaa4756aaa354a308424cdea5008d6b686bbd8601b7b7c513483d79f323904ebaf94e1fd67f65dfa7cb993ba5c5751e16a297b94b3307ae66

@ -1,6 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/po-mode/po-mode-0.18.1.1.ebuild,v 1.10 2013/09/17 17:37:34 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/po-mode/po-mode-0.18.3.2.ebuild,v 1.1 2014/02/12 07:22:58 ulm Exp $
EAPI=5
inherit elisp
@ -10,12 +12,8 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
ELISP_REMOVE="start-po.el"
SITEFILE="50${PN}-gentoo.el"
src_compile() {
elisp-compile po-mode.el po-compat.el || die
}

@ -1,6 +1,3 @@
;;; site-lisp configuration for stripes
(add-to-list 'load-path "@SITELISP")
(autoload 'stripes-mode "stripes" "Toggle Color alternation mode." t)
(autoload 'turn-on-stripes-mode "stripes" "Turn on color alternation mode." t)

@ -1,16 +1,17 @@
# Copyright 1999-2007 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/stripes/stripes-0.2-r1.ebuild,v 1.4 2007/10/18 21:30:28 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/stripes/stripes-0.2-r1.ebuild,v 1.5 2014/02/12 07:55:18 ulm Exp $
EAPI=5
inherit elisp
DESCRIPTION="Stripes is an Emacs mode which highlights every even line with an alternative background color"
DESCRIPTION="An Emacs mode which highlights every even line with an alternative background color"
HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki/StripesMode"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 x86"
IUSE=""
SITEFILE=51${PN}-gentoo.el
SITEFILE="50${PN}-gentoo.el"

@ -0,0 +1,153 @@
flask: fix reading strings from guest memory
Since the string size is being specified by the guest, we must range
check it properly before doing allocations based on it. While for the
two cases that are exposed only to trusted guests (via policy
restriction) this just uses an arbitrary upper limit (PAGE_SIZE), for
the FLASK_[GS]ETBOOL case (which any guest can use) the upper limit
gets enforced based on the longest name across all boolean settings.
This is XSA-84.
Reported-by: Matthew Daley <mattd@bugfuzz.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
--- a/xen/xsm/flask/flask_op.c
+++ b/xen/xsm/flask/flask_op.c
@@ -53,6 +53,7 @@ static DEFINE_SPINLOCK(sel_sem);
/* global data for booleans */
static int bool_num = 0;
static int *bool_pending_values = NULL;
+static size_t bool_maxstr;
static int flask_security_make_bools(void);
extern int ss_initialized;
@@ -71,9 +72,15 @@ static int domain_has_security(struct do
perms, NULL);
}
-static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf, uint32_t size)
+static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf,
+ size_t size, size_t max_size)
{
- char *tmp = xmalloc_bytes(size + 1);
+ char *tmp;
+
+ if ( size > max_size )
+ return -ENOENT;
+
+ tmp = xmalloc_array(char, size + 1);
if ( !tmp )
return -ENOMEM;
@@ -99,7 +106,7 @@ static int flask_security_user(struct xe
if ( rv )
return rv;
- rv = flask_copyin_string(arg->u.user, &user, arg->size);
+ rv = flask_copyin_string(arg->u.user, &user, arg->size, PAGE_SIZE);
if ( rv )
return rv;
@@ -210,7 +217,7 @@ static int flask_security_context(struct
if ( rv )
return rv;
- rv = flask_copyin_string(arg->context, &buf, arg->size);
+ rv = flask_copyin_string(arg->context, &buf, arg->size, PAGE_SIZE);
if ( rv )
return rv;
@@ -303,7 +310,7 @@ static int flask_security_resolve_bool(s
if ( arg->bool_id != -1 )
return 0;
- rv = flask_copyin_string(arg->name, &name, arg->size);
+ rv = flask_copyin_string(arg->name, &name, arg->size, bool_maxstr);
if ( rv )
return rv;
@@ -334,7 +341,7 @@ static int flask_security_set_bool(struc
int num;
int *values;
- rv = security_get_bools(&num, NULL, &values);
+ rv = security_get_bools(&num, NULL, &values, NULL);
if ( rv != 0 )
goto out;
@@ -440,7 +447,7 @@ static int flask_security_make_bools(voi
xfree(bool_pending_values);
- ret = security_get_bools(&num, NULL, &values);
+ ret = security_get_bools(&num, NULL, &values, &bool_maxstr);
if ( ret != 0 )
goto out;
--- a/xen/xsm/flask/include/conditional.h
+++ b/xen/xsm/flask/include/conditional.h
@@ -13,7 +13,9 @@
#ifndef _FLASK_CONDITIONAL_H_
#define _FLASK_CONDITIONAL_H_
-int security_get_bools(int *len, char ***names, int **values);
+#include <xen/types.h>
+
+int security_get_bools(int *len, char ***names, int **values, size_t *maxstr);
int security_set_bools(int len, int *values);
--- a/xen/xsm/flask/ss/services.c
+++ b/xen/xsm/flask/ss/services.c
@@ -1900,7 +1900,7 @@ int security_find_bool(const char *name)
return rv;
}
-int security_get_bools(int *len, char ***names, int **values)
+int security_get_bools(int *len, char ***names, int **values, size_t *maxstr)
{
int i, rc = -ENOMEM;
@@ -1908,6 +1908,8 @@ int security_get_bools(int *len, char **
if ( names )
*names = NULL;
*values = NULL;
+ if ( maxstr )
+ *maxstr = 0;
*len = policydb.p_bools.nprim;
if ( !*len )
@@ -1929,16 +1931,17 @@ int security_get_bools(int *len, char **
for ( i = 0; i < *len; i++ )
{
- size_t name_len;
+ size_t name_len = strlen(policydb.p_bool_val_to_name[i]);
+
(*values)[i] = policydb.bool_val_to_struct[i]->state;
if ( names ) {
- name_len = strlen(policydb.p_bool_val_to_name[i]) + 1;
- (*names)[i] = (char*)xmalloc_array(char, name_len);
+ (*names)[i] = xmalloc_array(char, name_len + 1);
if ( !(*names)[i] )
goto err;
- strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len);
- (*names)[i][name_len - 1] = 0;
+ strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len + 1);
}
+ if ( maxstr && name_len > *maxstr )
+ *maxstr = name_len;
}
rc = 0;
out:
@@ -2056,7 +2059,7 @@ static int security_preserve_bools(struc
struct cond_bool_datum *booldatum;
struct cond_node *cur;
- rc = security_get_bools(&nbools, &bnames, &bvalues);
+ rc = security_get_bools(&nbools, &bnames, &bvalues, NULL);
if ( rc )
goto out;
for ( i = 0; i < nbools; i++ )

@ -0,0 +1,31 @@
From 593bc8c63d582ec0fc2b3a35336106cf9c3a8b34 Mon Sep 17 00:00:00 2001
From: Matthew Daley <mattd@bugfuzz.com>
Date: Sun, 12 Jan 2014 14:29:32 +1300
Subject: [PATCH] xsm/flask: correct off-by-one in
flask_security_avc_cachestats cpu id check
This is XSA-85
Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/xsm/flask/flask_op.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c
index 4426ab9..22878f5 100644
--- a/xen/xsm/flask/flask_op.c
+++ b/xen/xsm/flask/flask_op.c
@@ -457,7 +457,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg)
{
struct avc_cache_stats *st;
- if ( arg->cpu > nr_cpu_ids )
+ if ( arg->cpu >= nr_cpu_ids )
return -ENOENT;
if ( !cpu_online(arg->cpu) )
return -ENOENT;
--
1.8.5.2

@ -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/xen/xen-4.2.2-r4.ebuild,v 1.1 2014/02/07 08:21:21 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.2-r4.ebuild,v 1.2 2014/02/12 14:08:09 keytoaster Exp $
EAPI=5
@ -49,7 +49,8 @@ XSA_PATCHES=(
"${FILESDIR}"/${PN}-CVE-2013-4554-XSA-76.patch
"${FILESDIR}"/${PN}-CVE-2013-6400-XSA-80.patch
"${FILESDIR}"/${PN}-4-XSA-83.patch # bug #499054
"${FILESDIR}"/${PN}-4.2-CVE-2014-263-XSA-84-85.patch # bug #500528 500536
"${FILESDIR}"/${PN}-4.2-XSA-84.patch # bug #500536
"${FILESDIR}"/${PN}-4.2-XSA-85.patch # bug #500528
"${FILESDIR}"/${PN}-4.2-XSA-87.patch # bug #499124
)

@ -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-leechcraft/leechcraft-meta/leechcraft-meta-0.6.60.ebuild,v 1.1 2014/01/08 09:58:21 maksbotan Exp $
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/leechcraft-meta/leechcraft-meta-0.6.60.ebuild,v 1.2 2014/02/11 20:34:02 maksbotan Exp $
EAPI="5"
@ -13,6 +13,7 @@ LICENSE="GPL-3"
IUSE="de"
RDEPEND="
~app-leechcraft/lc-blogique-${PV}
~app-leechcraft/lc-popishu-${PV}
~app-leechcraft/lc-monocle-${PV}
~app-leechcraft/lc-hotstreams-${PV}

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/leechcraft-meta/leechcraft-meta-9999.ebuild,v 1.9 2014/01/08 09:58:21 maksbotan Exp $
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/leechcraft-meta/leechcraft-meta-9999.ebuild,v 1.10 2014/02/11 20:34:02 maksbotan Exp $
EAPI="5"
@ -13,6 +13,7 @@ LICENSE="GPL-3"
IUSE="de"
RDEPEND="
~app-leechcraft/lc-blogique-${PV}
~app-leechcraft/lc-popishu-${PV}
~app-leechcraft/lc-monocle-${PV}
~app-leechcraft/lc-hotstreams-${PV}

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.6.1.ebuild,v 1.3 2014/02/09 12:57:05 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.6.1.ebuild,v 1.4 2014/02/11 21:11:32 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@ -27,6 +27,7 @@ RDEPEND="
>=dev-scheme/guile-1.8.3:12[deprecated,regex]
dev-scheme/guile-www
>=dev-scheme/slib-3.1.4
gnome-base/libgnomecanvas
gnome-base/libgnome-keyring
>=net-libs/webkit-gtk-1.2:2
>=sys-libs/zlib-1.1.4

@ -1,4 +1,3 @@
DIST fish-1.23.1.tar.bz2 876148 SHA256 1ea3d6532226c315993fabd6096ec865fdcde4d43df9e26f9ed020e11e631f93 SHA512 2f51cf10d4d03ddd776a616c9ac6ff9c4dd4af9ffcfc41a0db38fc67a45f661c24cd163762091cea7e42f952b9fc621a5e7434302f1d1043b7d01057fee44a80 WHIRLPOOL 9d635ef1674753812da37d287c2827ac6b841e6fb9aef25fbe3c84ee881c57bea31d27dd80c8a5ff4fbbceea177241f80461eba77bae41713b1b0b260ae38cf2
DIST fish-2.0.0.tar.gz 1540652 SHA256 7e4c4a0b3c518769a3d31b235e743de7a8d52f851ad19d2df9d53534e6238303 SHA512 a41e1b3737d5b556e08728312f486c55d1405492dd0be8a97694dabc0974b90ecbacfc74d3e427d63e9b3a639a03844b98ecded68cb3060522eee68879c28ce1 WHIRLPOOL f4e0013ceffcc04be6e9a2187da621db5e1e0592c5c9707bda114d2c9162758a83371392bedbecb5c8ff6eb9d065c2c356581fc21309527986ac2bc3fb0866cf
DIST fish-2.1.0-docdir.patch 1925 SHA256 9a6ed852cd58a9d8a24ac2c222026f1e6f6aa7bb8e515b5a1aa64414dedb81b5 SHA512 724120855bbb4cd6c9db440ff9b001a92c01a67f75c86be95fc890c52d3802f6857c27ee989f183a39aa5aace576fce72e9e36c6b7f0457f1ba4c9d6f54efb6f WHIRLPOOL ca31e6560bd36147184443b84ad96987003cfb486d14fccb74f19a88489f355814ed2ac136b4fcc14e5fb9986b069a395ef4e60aa0a30a0ce55d893499711003
DIST fish-2.1.0.tar.gz 1707921 SHA256 af527af9d145df5675ca3031c1a87007d4f4753a1cde49da88f4eb883a1cf044 SHA512 cd8a678df948baefafbf54a14ece7b52fff6620939d82ba0d0f4cd8ad1ae59842a847231de8465a4471e48fb86866f1113bba4ec9cd6433851bb538b1f965075 WHIRLPOOL 45cf56f2711380764065963a374f7613d83f07c8c2bc7e9724c5f2bfb55720989d52dad2bba85354013de98af58c10dad64a2cbc2b6f409f997f2ed8a2720881

@ -1,66 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-1.23.1-r2.ebuild,v 1.4 2012/06/06 06:17:52 jdhore Exp $
EAPI="4"
inherit base autotools eutils
DESCRIPTION="fish is the Friendly Interactive SHell"
HOMEPAGE="http://fishshell.com/"
SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="X vanilla"
DEPEND="sys-libs/ncurses
sys-devel/bc
sys-devel/gettext
www-client/htmlview
X? ( x11-misc/xsel )"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-1.23.0-glibc-2.8.patch"
"${FILESDIR}/${PN}-1.22.3-gettext.patch"
"${FILESDIR}/${P}-gentoo-alt.patch"
)
src_prepare() {
base_src_prepare
if ! use vanilla ; then
epatch "${FILESDIR}"/${P}-fish_indent.patch
epatch "${FILESDIR}"/${P}-multi-line_prompts.patch
fi
eautoreconf
}
src_configure() {
# Set things up for fish to be a default shell.
# It has to be in /bin in case /usr is unavailable.
# Also, all of its utilities have to be in /bin.
econf \
docdir="${EPREFIX}"/usr/share/doc/${PF} \
--without-xsel \
--bindir="${EPREFIX}"/bin
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
}
pkg_postinst() {
elog
elog "To use ${PN} as your default shell, you need to add ${EPREFIX}/bin/${PN}"
elog "to ${EPREFIX}/etc/shells."
elog
ewarn "Many files moved to ${EROOT}usr/share/fish/completions from ${EROOT}etc/fish.d/."
ewarn "Delete everything in ${EROOT}etc/fish.d/ except fish_interactive.fish."
ewarn "Otherwise, fish won't notice updates to the installed files,"
ewarn "because the ones in /etc will override the new ones in /usr."
echo
}

@ -1,61 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-1.23.1.ebuild,v 1.6 2011/07/07 10:41:38 polynomial-c Exp $
EAPI="3"
inherit base autotools
DESCRIPTION="fish is the Friendly Interactive SHell"
HOMEPAGE="http://fishshell.com/"
SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="X"
DEPEND="sys-libs/ncurses
sys-devel/bc
sys-devel/gettext
www-client/htmlview
X? ( x11-misc/xsel )"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-1.23.0-glibc-2.8.patch"
"${FILESDIR}/${PN}-1.22.3-gettext.patch"
"${FILESDIR}/${P}-gentoo-alt.patch"
)
src_prepare() {
base_src_prepare
eautoreconf
}
src_configure() {
# Set things up for fish to be a default shell.
# It has to be in /bin in case /usr is unavailable.
# Also, all of its utilities have to be in /bin.
econf \
docdir="${EPREFIX}"/usr/share/doc/${PF} \
--without-xsel \
--bindir="${EPREFIX}"/bin
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
}
pkg_postinst() {
elog
elog "To use ${PN} as your default shell, you need to add ${EPREFIX}/bin/${PN}"
elog "to ${EPREFIX}/etc/shells."
elog
ewarn "Many files moved to ${EROOT}usr/share/fish/completions from ${EROOT}etc/fish.d/."
ewarn "Delete everything in ${EROOT}etc/fish.d/ except fish_interactive.fish."
ewarn "Otherwise, fish won't notice updates to the installed files,"
ewarn "because the ones in /etc will override the new ones in /usr."
echo
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.0.0.ebuild,v 1.4 2013/09/05 19:24:42 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.0.0.ebuild,v 1.5 2014/02/11 12:28:14 polynomial-c Exp $
EAPI=5
@ -18,7 +18,6 @@ IUSE="X"
DEPEND="sys-libs/ncurses
sys-devel/bc
sys-devel/gettext
www-client/htmlview
X? ( x11-misc/xsel )"
RDEPEND="${DEPEND}"
@ -50,5 +49,9 @@ pkg_postinst() {
elog "To scan your man pages for completions, run 'fish_update_completions'"
elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
elog
elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
elog "browser of your choice to get acces to ${PN}'s help system:"
elog " BROWSER=\"/usr/bin/firefox\""
elog
elog "Have fun!"
}

@ -1,9 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r1.ebuild,v 1.1 2013/11/04 09:51:08 polynomial-c Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r2.ebuild,v 1.2 2014/02/11 12:40:06 polynomial-c Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
inherit base autotools
DESCRIPTION="fish is the Friendly Interactive SHell"
@ -19,8 +21,10 @@ IUSE="X"
DEPEND="sys-libs/ncurses
sys-devel/bc
sys-devel/gettext
www-client/htmlview
X? ( x11-misc/xsel )"
# fish can add man-page completions from lzma and xz compressed man pages
# through a python script. That's why we depend on python here (bug #490478)
RDEPEND="${DEPEND}"
src_prepare() {
@ -38,6 +42,14 @@ src_configure() {
--bindir="${EPREFIX}"/bin
}
src_test() {
if has_version ~${CATEGORY}/${P} ; then
emake test
else
ewarn "The test suite only works when the package is already installed"
fi
}
pkg_postinst() {
elog "fish is now installed on your system."
elog "To run fish, type 'fish' in your terminal."
@ -51,5 +63,14 @@ pkg_postinst() {
elog "To scan your man pages for completions, run 'fish_update_completions'"
elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
elog
elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
elog "browser of your choice to get acces to ${PN}'s help system:"
elog " BROWSER=\"/usr/bin/firefox\""
elog
elog "In order to get lzma and xz support for man-page completion please"
elog "emerge one of the following packages:"
elog " dev-python/backports-lzma"
elog " >=dev-lang/python-3.3"
elog
elog "Have fun!"
}

@ -1,2 +1 @@
DIST aspell-0.50.5.tar.gz 1016586 SHA256 e385d747d7423846760170476f16f12719cf2846a99e1b5acea13eeb948c1f4d SHA512 db8b900064801ea3b052126237307bfb434f28c0a3442c533c4b15b514fc8e8a392829b3f7c1cd16970069543e1ef497b1e7a4052056c31ddee7de4524927ca1 WHIRLPOOL 53dc5297f209074e4af62f1610e98c0093a8e8858a02186b6a9b42a91a1c9cd3d0422308233ebb523c7c14e1565fff18bcbbd3708beaae27fe6a5c2fde7e251b
DIST aspell-0.60.6.1.tar.gz 1878163 SHA256 f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 SHA512 f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f WHIRLPOOL 0c77b95a29b598491c12cf22737d5ff758b2758b4f815356d2f52da398afe2b45209cd3b59f90e5b3c1976ee8a09e8cd553507bd93a0cd49043c8531f9a4990b

@ -1,75 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.5-r4.ebuild,v 1.20 2011/02/06 05:34:40 leio Exp $
inherit libtool eutils flag-o-matic
DESCRIPTION="A spell checker replacement for ispell"
HOMEPAGE="http://aspell.net/"
SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
IUSE="gpm"
DEPEND=">=sys-libs/ncurses-5.2
gpm? ( sys-libs/gpm )"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${PN}-0.50.5-charcount.patch
epatch "${FILESDIR}"/${PN}-quotechar-fix.patch
}
src_compile() {
if [ "${ARCH}" == "ppc" ] ; then
append-flags -O2 -fsigned-char
fi
if [ "${ARCH}" == "alpha" ]; then
replace-flags -Os -O2
fi
use gpm && append-ldflags -lgpm
filter-flags -fno-rtti
elibtoolize --reverse-deps
econf \
--disable-static \
--sysconfdir=/etc/aspell \
--enable-docdir=/usr/share/doc/${PF} || die
emake || die
}
src_install() {
dodoc README* TODO
make DESTDIR=${D} install || die
mv ${D}/usr/share/doc/${PF}/man-html ${D}/usr/share/doc/${PF}/html
mv ${D}/usr/share/doc/${PF}/man-text ${D}/usr/share/doc/${PF}/text
# install ispell/aspell compatibility scripts
exeinto /usr/bin
newexe scripts/ispell ispell-aspell
newexe scripts/spell spell-aspell
cd examples
make clean || die
docinto examples
dodoc ${S}/examples/*
}
pkg_postinst() {
elog "You will need to install a dictionary now. Please choose an"
elog "aspell-<LANG> dictionary from the app-dicts category"
elog "After installing an aspell dictionary for your language(s),"
elog "You may use the aspell-import utility to import your personal"
elog "dictionaries from ispell, pspell and the older aspell"
ewarn ""
ewarn "Please re-emerge ALL your aspell-LANG dictionaries"
ewarn ""
ebeep 5
}

@ -1,9 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.12 2014/02/11 06:47:09 nerdboy Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.13 2014/02/11 15:56:58 mr_bones_ Exp $
EAPI=4
inherit libtool eutils flag-o-matic autotools
DESCRIPTION="A spell checker replacement for ispell"
@ -47,12 +46,13 @@ src_prepare() {
# fix for bug #467602
if has_version ">=sys-devel/automake-1.13" ; then
sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
"${S}"/configure.ac || die "sed failed"
"${S}"/configure.ac || die
fi
epatch "${FILESDIR}/${PN}-0.60.5-nls.patch"
epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch"
epatch "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
epatch \
"${FILESDIR}/${PN}-0.60.5-nls.patch" \
"${FILESDIR}/${PN}-0.60.5-solaris.patch" \
"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
rm m4/lt* m4/libtool.m4
eautoreconf
@ -62,14 +62,14 @@ src_prepare() {
# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
# This has to be after automake has run so that we don't clobber
# the default target that automake creates for us.
echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in
echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
}
src_configure() {
# if ncurses is built with separate tinfo libs, then...
if built_with_use sys-libs/ncurses tinfo ; then
if built_with_use sys-libs/ncurses unicode ; then
if has_version "sys-libs/ncurses[tinfo]" ; then
if has_version "sys-libs/ncurses[unicode]" ; then
CURSES_LIB="-lncursesw -ltinfow"
else
CURSES_LIB="-lncurses -ltinfo"

@ -1,77 +0,0 @@
diff -Nrup aspell-0.50.5.orig/prog/compress.c aspell-0.50.5/prog/compress.c
--- aspell-0.50.5.orig/prog/compress.c 2002-08-31 14:51:11.000000000 -0400
+++ aspell-0.50.5/prog/compress.c 2004-08-15 15:07:26.000000000 -0400
@@ -28,24 +28,27 @@
#endif
+#define BUFSIZE 256
+
void usage ()
{
fputs("Compresses or uncompresses sorted word lists.\n" , stderr);
fputs("For best result the locale should be set to C\n" , stderr);
fputs("before sorting by setting the environmental\n" , stderr);
fputs("variable LANG to \"C\" before sorting.\n" , stderr);
- fputs("Copyright 2001 by Kevin Atkinson.\n" , stderr);
+ fputs("Copyright 2001-2004 by Kevin Atkinson.\n" , stderr);
fputs("Usage: word-list-compress c[ompress]|d[ecompress]\n" , stderr);
}
-static int get_word(FILE * in, char * w)
+static int get_word(FILE * in, char * w, size_t bufsize)
{
int c;
while (c = getc(in), c != EOF && c <= 32);
if (c == EOF) return 0;
do {
*w++ = (char)(c);
- } while (c = getc(in), c != EOF && c > 32);
+ --bufsize;
+ } while (c = getc(in), c != EOF && c > 32 && bufsize > 1);
*w = '\0';
ungetc(c, in);
if (c == EOF) return 0;
@@ -61,15 +64,15 @@ int main (int argc, const char *argv[])
} else if (argv[1][0] == 'c') {
- char s1[256];
- char s2[256];
+ char s1[BUFSIZE];
+ char s2[BUFSIZE];
char * prev = s2;
char * cur = s1;
*prev = '\0';
SETBIN (stdout);
- while (get_word(stdin, cur)) {
+ while (get_word(stdin, cur, BUFSIZE)) {
int i = 0;
/* get the length of the prefix */
while (prev[i] != '\0' && cur[i] != '\0' && prev[i] == cur[i])
@@ -99,9 +102,10 @@ int main (int argc, const char *argv[])
while (i != -1 ) {
if (i == 0)
i = getc(stdin);
- --i;
- while ((c = getc(stdin)) > 32)
+ --i; if (i < 0) goto error;
+ while ((c = getc(stdin)) > 32 && i < BUFSIZE)
cur[i++] = (char)c;
+ if (i >= BUFSIZE) goto error;
cur[i] = '\0';
fputs(cur, stdout);
putc('\n', stdout);
@@ -109,6 +113,10 @@ int main (int argc, const char *argv[])
}
return 0;
+error:
+ fputs("ERROR: Corrupt Input.\n", stderr);
+ return 2;
+
} else {
usage();

@ -1,8 +0,0 @@
--- common/string_map.cpp~ 2004-07-15 12:58:58.000000000 +0200
+++ common/string_map.cpp 2005-07-19 14:31:42.000000000 +0200
@@ -82,3 +82,5 @@
}
}
+template class acommon::HashTable<acommon::StringMap::Parms>;
+template class acommon::BlockSList<acommon::StringPair>;

@ -1,154 +0,0 @@
diff -Naur aspell-0.60.5-orig/common/convert.cpp aspell-0.60.5/common/convert.cpp
--- aspell-0.60.5-orig/common/convert.cpp 2006-11-18 02:36:01.000000000 -0600
+++ aspell-0.60.5/common/convert.cpp 2007-12-29 11:17:11.000000000 -0600
@@ -238,7 +238,7 @@
}
template <class T>
- static void free_norm_table(NormTable<T> * d)
+ void free_norm_table(NormTable<T> * d)
{
for (T * cur = d->data; cur != d->end; ++cur) {
if (cur->sub_table)
diff -Naur aspell-0.60.5-orig/common/string.hpp aspell-0.60.5/common/string.hpp
--- aspell-0.60.5-orig/common/string.hpp 2004-11-29 11:50:05.000000000 -0600
+++ aspell-0.60.5/common/string.hpp 2007-12-29 11:17:11.000000000 -0600
@@ -129,10 +129,10 @@
}
char & operator[] (size_t pos) {return begin_[pos];}
- const char operator[] (size_t pos) const {return begin_[pos];}
+ char operator[] (size_t pos) const {return begin_[pos];}
char & back() {return end_[-1];}
- const char back() const {return end_[-1];}
+ char back() const {return end_[-1];}
void clear() {end_ = begin_;}
@@ -492,7 +492,7 @@
namespace std
{
- template<> static inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
+ template<> inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);}
}
#endif
diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.cpp aspell-0.60.5/modules/speller/default/affix.cpp
--- aspell-0.60.5-orig/modules/speller/default/affix.cpp 2006-01-21 08:27:54.000000000 -0600
+++ aspell-0.60.5/modules/speller/default/affix.cpp 2007-12-29 11:17:11.000000000 -0600
@@ -193,7 +193,7 @@
typedef const Conds * Value;
typedef const char * Key;
static const bool is_multi = false;
- hash<const char *> hfun;
+ acommon::hash<const char *> hfun;
size_t hash(const char * s) {return hfun(s);}
bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;}
const char * key(const Conds * c) {return c->str;}
diff -Naur aspell-0.60.5-orig/modules/speller/default/affix.hpp aspell-0.60.5/modules/speller/default/affix.hpp
--- aspell-0.60.5-orig/modules/speller/default/affix.hpp 2004-11-29 11:50:06.000000000 -0600
+++ aspell-0.60.5/modules/speller/default/affix.hpp 2007-12-29 11:17:11.000000000 -0600
@@ -107,7 +107,7 @@
{
return expand(word,aff,buf,0);
}
- WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
+ WordAff * expand_suffix(ParmString word, const unsigned char * aff,
ObjStack &, int limit = INT_MAX,
unsigned char * new_aff = 0, WordAff * * * l = 0,
ParmString orig_word = 0) const;
diff -Naur aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp aspell-0.60.5/modules/speller/default/readonly_ws.cpp
--- aspell-0.60.5-orig/modules/speller/default/readonly_ws.cpp 2006-11-18 03:17:19.000000000 -0600
+++ aspell-0.60.5/modules/speller/default/readonly_ws.cpp 2007-12-29 11:17:11.000000000 -0600
@@ -726,7 +726,7 @@
struct WordLookupParms {
const char * block_begin;
WordLookupParms() {}
- typedef Vector<u32int> Vector;
+ typedef acommon::Vector<u32int> Vector;
typedef u32int Value;
typedef const char * Key;
static const bool is_multi = false;
diff -Naur aspell-0.60.5-orig/prog/aspell.cpp aspell-0.60.5/prog/aspell.cpp
--- aspell-0.60.5-orig/prog/aspell.cpp 2006-12-19 04:51:08.000000000 -0600
+++ aspell-0.60.5/prog/aspell.cpp 2007-12-29 11:18:10.000000000 -0600
@@ -239,6 +239,14 @@
return i;
}
+static void line_buffer() {
+#ifndef WIN32
+ // set up stdin and stdout to be line buffered
+ assert(setvbuf(stdin, 0, _IOLBF, 0) == 0);
+ assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
+#endif
+}
+
Conv dconv;
Conv uiconv;
@@ -686,11 +694,7 @@
void pipe()
{
-#ifndef WIN32
- // set up stdin and stdout to be line buffered
- assert(setvbuf(stdin, 0, _IOLBF, 0) == 0);
- assert(setvbuf(stdout, 0, _IOLBF, 0) == 0);
-#endif
+ line_buffer();
bool terse_mode = true;
bool do_time = options->retrieve_bool("time");
@@ -1651,6 +1655,7 @@
Conv oconv(setup_conv(lang, options));
String word;
String sl;
+ line_buffer();
while (CIN.getline(word)) {
const char * w = iconv(word);
lang->LangImpl::to_soundslike(sl, w);
@@ -1675,6 +1680,7 @@
Conv oconv(setup_conv(lang, options));
String word;
GuessInfo gi;
+ line_buffer();
while (CIN.getline(word)) {
lang->munch(iconv(word), &gi);
COUT << word;
@@ -1713,6 +1719,7 @@
String word, buf;
ObjStack exp_buf;
WordAff * exp_list;
+ line_buffer();
while (CIN.getline(word)) {
buf = word;
char * w = iconv(buf.mstr(), buf.size());
@@ -1799,6 +1806,7 @@
String word;
String base;
String affs;
+ line_buffer();
while (CIN.getline(word)) {
word = iconv(word);
@@ -1882,7 +1890,7 @@
typedef SML_WordEntry Value;
typedef const char * Key;
static const bool is_multi = false;
- hash<const char *> hash;
+ acommon::hash<const char *> hash;
bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
Key key(const Value & v) {return v.word;}
};
@@ -2033,7 +2041,7 @@
typedef CML_Entry Value;
typedef const char * Key;
static const bool is_multi = true;
- hash<const char *> hash;
+ acommon::hash<const char *> hash;
bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
Key key(const Value & v) {return v.word;}
};

@ -1,46 +0,0 @@
https://bugs.gentoo.org/show_bug.cgi?id=327405
http://sourceforge.net/tracker/?func=detail&aid=2955373&group_id=245&atid=100245
diff -u -r1.19.2.5 check_funs.cpp
--- prog/check_funs.cpp 3 Mar 2010 05:16:24 -0000 1.19.2.5
+++ prog/check_funs.cpp 3 Mar 2010 05:34:52 -0000
@@ -327,7 +327,11 @@
wnoutrefresh(choice_w);
doupdate();
line.resize(0);
+#ifdef HAVE_WIDE_CURSES
+ wint_t c;
+#else
int c;
+#endif
noecho();
int begin_x;
{int junk; getyx(choice_w, junk, begin_x);}
@@ -336,13 +340,12 @@
while (true) {
handle_last_signal();
#ifdef HAVE_WIDE_CURSES
- wint_t wi = 0;
- int res = wget_wch(choice_w, &wi);
- c = wi;
+ int res = wget_wch(choice_w, &c);
+ if (res == ERR) continue;
#else
c = wgetch(choice_w);
-#endif
if (c == ERR) continue;
+#endif
if (c == '\r' || c == '\n' || c == KEY_ENTER)
break;
if (c == control('c') || c == KEY_BREAK) {
@@ -373,7 +376,9 @@
} else if (x < max_x && 32 <= c && c != '\x7F' && NOT_KEY /*c < 256*/) {
#ifdef HAVE_WIDE_CURSES
wchar_t wc = c;
- wins_nwstr(choice_w, &wc, 1);
+ cchar_t cc;
+ setcchar(&cc, &wc, 0, 0, NULL);
+ wins_wch(choice_w, &cc);
#else
winsch(choice_w, c);
#endif

@ -1,13 +0,0 @@
diff -uNr ./modules/filter/email.cpp ./modules/filter/email.cpp
--- ./modules/filter/email.cpp 2004-04-24 12:39:56.371216800 +0300
+++ ./modules/filter/email.cpp 2004-04-24 12:40:05.521825696 +0300
@@ -33,7 +33,8 @@
memset(data, 0, sizeof(bool)*256);
return no_err;
}
- bool have(char c) {
+ bool have(FilterChar::Chr c) {
+ if (c > 255) return false;
return data[static_cast<unsigned char>(c)];
}
QuoteChars() {clear();}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/bogosort/bogosort-0.4.2-r1.ebuild,v 1.1 2013/05/10 05:47:53 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/bogosort/bogosort-0.4.2-r1.ebuild,v 1.2 2014/02/11 19:27:39 jer Exp $
EAPI="5"
@ -12,7 +12,7 @@ SRC_URI="ftp://ulrik.haugen.se/pub/unix/bogosort/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
KEYWORDS="~amd64 hppa ~mips ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
IUSE=""
DEPEND=""

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild,v 1.4 2014/01/18 11:46:00 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild,v 1.5 2014/02/11 20:25:32 grobian Exp $
EAPI=5
@ -20,7 +20,10 @@ RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
dev-libs/libxml2"
DEPEND=""
MAKEOPTS+=" EPREFIX=${EPREFIX}"
pkg_setup() {
# export for bug #490754
export MAKEOPTS+=" EPREFIX=${EPREFIX}"
}
src_prepare() {
sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.9.ebuild,v 1.4 2013/10/01 21:16:50 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.9.ebuild,v 1.5 2014/02/11 19:31:41 jer Exp $
EAPI=4
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="debug nsplugin"
RDEPEND="

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.3_p20140118.ebuild,v 1.2 2014/01/29 14:37:28 hattya Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.3_p20140118.ebuild,v 1.3 2014/02/12 01:04:08 jer Exp $
EAPI=5
@ -12,7 +12,7 @@ SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=01f0a0db15faf4bffa
LICENSE="AGPL-3"
SLOT="0/1.3"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~amd64 ~arm hppa ~ia64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="X vanilla static static-libs"
LIB_DEPEND="dev-libs/openssl[static-libs?]

@ -1,8 +1,2 @@
DIST pelican-2.8.1.tar.gz 3214448 SHA256 ea5c6d085b8395a6bacc3b1b0300713cdfc6252f74928db52fa124e407768c6b SHA512 a00d1e4c3d1e5dd984278acfc03b0c13872d607da7e74c9e1405ff0e90e5636959369960442ae46dddb70c100b990501474bc6fda101e4348374ede96499d9b2 WHIRLPOOL 942d0b766607f015e04628c51a978c560e1a4fa44a13801732b2dcaabf6c414f62f9ef77f07833c95074a42df8165c5e4edc2f603bf959d95b353a2b74c50202
DIST pelican-3.0.1.tar.gz 1563862 SHA256 40177e3255871e362b721d91b3a706ab258664a78cab2531bceb4b68c1c1602c SHA512 135b54b96f828a0b601f7dc83f93710fbd7c7a977c791f27c4b603b65e6ad6071e6790b931c570f0d7da0c732c95907e50e7df2747b74212ea0f5a64ab065db1 WHIRLPOOL fd3cbc953d81d8d2954c5aa7f67ea7d37fa590bd2b2bdcc7ccfedac653ad95e227265e2244807f6ed361e403f91b2e81788d144873d951ff496c802fc75c896a
DIST pelican-3.0.tar.gz 4317998 SHA256 f5adfa24834cd0af844bbe2616161cf50d319b400c8b7e5f95b116df56fd8776 SHA512 092a185532b310998a7bc7b1993f77838d88153735170283bf5c59958b75c8a57fa5f64fe325db8541dc74cdf606089a7e096ca3e2fd8e3d90b4f5d1611da6fd WHIRLPOOL b7e1b6ba2e3ccbe2bb00a72debea66ae2fd0460f973e34888754d4b15697858489ed584d45d9a113a46da5d5b7a203a8f3f5f33b0acbf976ad63b7eff074dda6
DIST pelican-3.1.1.tar.gz 272667 SHA256 dddca733e2a5de44c70b83d77fa88e092ef6ba2a4d55fd96b06ce5cccd948521 SHA512 df1605c92507cc4240229710efec9a7856578df4ec3ea1985ca9e3a773df6c51d40d06bb3735ea5336e207b5546cd3833edab8cc19b01da6a33bf576b47311f0 WHIRLPOOL bd1376ced4066c0d75845ed81124ff992594cd2eaea9db80787bd278c4674c70cd32c46a668b35ea8098fc423c477c2849a6fea408634ff10e21256110e74fd5
DIST pelican-3.2.1.tar.gz 9045889 SHA256 280ff379d11690379aba9bc04280cb97bc60064e1eb61f40cfca5f576aee7070 SHA512 108aaba931afeb5cd05f4d9ef3329a5c78f598d1df4fe0322a9ee58c37f7ace0901ccb16cfe60aa850818bc5a749fbc82050794a7ee8d608e0150e1b8d50f898 WHIRLPOOL 9816386cfbf7a27b5e3a1ae71bbd0d36c6b5cee07f48a3d76312655f464a4a9b7d7e652b8d497431e4f5c790c7f2c0cb3c26d3ec0661c44673ff8f872af6cede
DIST pelican-3.2.2.tar.gz 164313 SHA256 858ea2a887dd10c8bacb45ce0c6e61cab4988545ad31c14432f02033895f76d6 SHA512 1b989c857aaad4cdf633e13d6949fb5d677bcb631dbaf8cc8a7409a31f3c8df96d8a66c25a7f939d37f1e15929c0a5630be9e91b8dd4d3f5218ebb9ce0d0ee3c WHIRLPOOL 96e3d998688ee56b9e73f3baf7898b23ada959a43e09b6b76eda9f0bffc70a526967e99b248ca5666ced3a183487dcc6444da7371550febd2742c95a8fbdf323
DIST pelican-3.2.tar.gz 162596 SHA256 dbceb9511d344021c266f2acc77d092af40f0eb76ba5329cae428150c045e616 SHA512 7c08eb8c191712ce2d49ae45911dd8c4aad08819384866b2667188e7d5f5ef8a492041c08821807edb84aac81d8e01069f2bf728e548b10f2830a3258716c8b3 WHIRLPOOL 6ad506e6c94b81f03441ce7d09a7f403e957177b4ff0dfe1d33718a230d88ec5fd8d0d9d4e4d3434c0577d2166380b5651d602324f4dd59f7241617df75b61c2
DIST pelican-3.3.tar.gz 195721 SHA256 6c3edb48517259465cad1cee18c5db2b595e726ec6f4eb5e1c858c8ecfd1ed99 SHA512 22416c1c86e3c704ca23030320f32cfca09fba34e66a4343a297ab50ffee2177d5fde5746c19975f47add05957644520f0080ddd1b8007a52dc63d5ae8a98dc3 WHIRLPOOL 5f0ea80f7c6fef0b008417f8b5669a574293b9084d35e4a4cfe17eb3c6d3defcb8e1cfa41d384e28b37424a7be869d9ef42d1c703228c795a09a88ea58f38189

@ -1,41 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-2.8.1.ebuild,v 1.2 2012/10/29 16:33:04 mgorny Exp $
EAPI=4
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files."
HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples markdown"
DEPEND="dev-python/feedgenerator
dev-python/jinja
dev-python/docutils
dev-python/pygments
dev-python/pytz
markdown? ( dev-python/markdown )
virtual/python-argparse"
RDEPEND=""
DOCS="README.rst"
src_install() {
distutils_src_install
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r samples/* || die "failed to install examples"
fi
}
# no tests: tests/content not in tarball for 2.8.1
# for 3.0, should be based on tox (refer to virtualenvwrapper)

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-3.0.1.ebuild,v 1.1 2012/12/10 05:32:16 patrick Exp $
EAPI=4
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files."
HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples markdown"
DEPEND="dev-python/feedgenerator
dev-python/jinja
dev-python/docutils
dev-python/pygments
dev-python/pytz
dev-python/unidecode
dev-python/blinker
markdown? ( dev-python/markdown )
virtual/python-argparse"
RDEPEND=""
DOCS="README.rst"
src_install() {
distutils_src_install
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r samples/* || die "failed to install examples"
fi
}
# no tests: tests/content not in tarball for 2.8.1
# for 3.0, should be based on tox (refer to virtualenvwrapper)

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-3.0.ebuild,v 1.2 2012/10/29 16:33:04 mgorny Exp $
EAPI=4
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files."
HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples markdown"
DEPEND="dev-python/feedgenerator
dev-python/jinja
dev-python/docutils
dev-python/pygments
dev-python/pytz
dev-python/unidecode
dev-python/blinker
markdown? ( dev-python/markdown )
virtual/python-argparse"
RDEPEND=""
DOCS="README.rst"
src_install() {
distutils_src_install
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r samples/* || die "failed to install examples"
fi
}
# no tests: tests/content not in tarball for 2.8.1
# for 3.0, should be based on tox (refer to virtualenvwrapper)

@ -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/app-text/pelican/pelican-3.1.1-r1.ebuild,v 1.1 2013/04/03 22:20:28 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files."
HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples markdown"
DEPEND="dev-python/feedgenerator[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/unidecode
dev-python/blinker[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
virtual/python-argparse[${PYTHON_USEDEP}]"
RDEPEND=""
DOCS="README.rst"
python_install() {
distutils-r1_python_install
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r samples/* || die "failed to install examples"
fi
}
# no tests: tests/content not in tarball for 2.8.1
# for 3.0, should be based on tox (refer to virtualenvwrapper)

@ -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/app-text/pelican/pelican-3.1.1.ebuild,v 1.1 2013/01/28 10:06:11 patrick Exp $
EAPI=4
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files."
HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples markdown"
DEPEND="dev-python/feedgenerator
dev-python/jinja
dev-python/docutils
dev-python/pygments
dev-python/pytz
dev-python/unidecode
dev-python/blinker
markdown? ( dev-python/markdown )
virtual/python-argparse"
RDEPEND=""
DOCS="README.rst"
src_install() {
distutils_src_install
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r samples/* || die "failed to install examples"
fi
}
# no tests: tests/content not in tarball for 2.8.1
# for 3.0, should be based on tox (refer to virtualenvwrapper)

@ -1,39 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-3.2.1.ebuild,v 1.2 2013/05/29 06:10:10 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
inherit distutils-r1
DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files."
HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples markdown"
DEPEND="dev-python/feedgenerator[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/unidecode[${PYTHON_USEDEP}]
dev-python/blinker[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
virtual/python-argparse[${PYTHON_USEDEP}]"
RDEPEND=""
DOCS=( README.rst )
python_install_all() {
use examples && local EXAMPLES=( samples/. )
distutils-r1_python_install_all
}
# no tests: tests/content not in tarball for 2.8.1
# for 3.0, should be based on tox (refer to virtualenvwrapper)

@ -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/app-text/pelican/pelican-3.2.ebuild,v 1.1 2013/05/02 05:56:24 patrick Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files."
HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples markdown"
DEPEND="dev-python/feedgenerator[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/unidecode
dev-python/blinker[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
virtual/python-argparse[${PYTHON_USEDEP}]"
RDEPEND=""
DOCS="README.rst"
python_install() {
distutils-r1_python_install
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r samples/* || die "failed to install examples"
fi
}
# no tests: tests/content not in tarball for 2.8.1
# for 3.0, should be based on tox (refer to virtualenvwrapper)

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.2.4.ebuild,v 1.3 2013/03/04 06:49:22 flameeyes Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.2.4.ebuild,v 1.4 2014/02/12 10:31:14 pinkbyte Exp $
EAPI=5
@ -52,12 +52,15 @@ pkg_setup() {
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-7.2.3-libtool.patch
epatch "${FILESDIR}"/${PN}-7.2.3+automake-1.12.patch
epatch "${FILESDIR}"/${PN}-7.2.4+boost-1.50.patch
epatch \
"${FILESDIR}/${PN}-7.2.3-libtool.patch" \
"${FILESDIR}/${PN}-7.2.3+automake-1.12.patch" \
"${FILESDIR}/${PN}-7.2.4+boost-1.50.patch" \
"${FILESDIR}/${P}-fix-boost_thread-detection.patch"
python_convert_shebangs -r 2 .
epatch_user
eautoreconf
}

@ -0,0 +1,18 @@
--- m4/pandora_have_libboost_thread.m4.orig 2014-02-12 13:52:43.580001598 +0400
+++ m4/pandora_have_libboost_thread.m4 2014-02-12 13:53:24.288002974 +0400
@@ -17,13 +17,13 @@
CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}"
AC_LANG_PUSH(C++)
- AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,,[
+ AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,boost_system-mt,[
#include <boost/thread.hpp>
],[
boost::thread id;
])
AS_IF([test "x${ac_cv_libboost_thread_mt}" = "xno"],[
- AC_LIB_HAVE_LINKFLAGS(boost_thread,,[
+ AC_LIB_HAVE_LINKFLAGS(boost_thread,boost_system,[
#include <boost/thread.hpp>
],[
boost::thread id;

@ -1,7 +1,10 @@
DIST sqlite-2.8.16.tar.gz 981834 SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512 262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a WHIRLPOOL 78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff
DIST sqlite-autoconf-3080200.tar.gz 1917056 SHA256 a0851d06092c8208e4dd947f569f40db476b472b22e3e10e2f52f3c5e94fef92 SHA512 31d47f366db9176df8c244361cab2295fcbcc06e47e3d9f758622a134f19f565c02e587f947939e2387bc488bbb2ad443dd1ba9e5520cc7f39bf398a44695bb1 WHIRLPOOL d3075381e43e82da79bc8186d02e88df125671950c4cff1b62b5ade186934ef6ac9d70f22784dd62149a7093395ae25bff0042ad34cc7bd9fdd947e54687988b
DIST sqlite-autoconf-3080300.tar.gz 1923594 SHA256 dabe38cf6732a9dfd57e9a2d2629dfb12ea3f2bf8948987f91318d01e6f72a26 SHA512 8e4e6133e99b31b026e969f28dcae6d57a9a099f08c98bb522f601527e1f287cf804007a12287a6f1105d7d5a7e655713ae257c38ee5478a44479b4e699c02c6 WHIRLPOOL 2b050d0bdf150392899591a66bfee05aa7f1c3959aaf32792fce6a65c9155f742ff954e022a84d7cdd7185c3e994071cf9d53a650c50377cbc0508b4137328af
DIST sqlite-autoconf-3080301.tar.gz 1923168 SHA256 de5dc216e9289fabf027f78dbbface32ffc8c6341b7d841d0814b1a452ffdb8c SHA512 5fef9769c7e8579aebfd83e7fe79ac0b1ec2939303b960e85deed4822382048c84ecdce3a18e33a0ca4277458cd79e00459934c994a4114ae94485454cb82b21 WHIRLPOOL f619b1267b2421dfc0bf6584c65e80fb0721247f0620592ad7efc2f2d026833aa80d5c66aa1f21fd5d5e9a1a75ffe4e830541deeec6dea338453a7286e48fb02
DIST sqlite-doc-3080200.zip 4272848 SHA256 384aa6735bd10e561820c4c61e7fd25f6b2416663f201151f31162741b868603 SHA512 b96de0be9ac2f7bbbe198c6b5ccf6b283aebe6d38533efdc384f20051b5a6c98bed6dadd13d2cc83f114200c15ea432e20d3e0aadf7f7000f618622f389efb8a WHIRLPOOL 348b7046a8111269e32f9e8023710c7f74401f6fc997396cd4853e1e4c804f26029d688b15333970f56d1a7404ab2cfdbeabe23a504974ea79a347408b8cba6d
DIST sqlite-doc-3080300.zip 4600279 SHA256 5bf632eba7f9ce324dd9b345448cc7875e6ee081c9df2f7d7dd2fb3c0fb02a23 SHA512 cf48c6c6cf0e2513cb8f43387d4ff5328f039f951ba10fdd3f41d2d179e879f79039edfb1e0d5655b7555eff0e4bbb74c1de196fa8a51634a0ca1ad2909b62ef WHIRLPOOL 04cf870fce40759c1c66fa2f323e7d54c8e80fdc5c0bf55f8e3f4f7f317bcf72316b322065287559718e1a3af56c8bda11a17e4783d3b920d12c0808b169d8f4
DIST sqlite-doc-3080301.zip 4603427 SHA256 7af07481a18e52fd1d8269c249f452650dfd380a75ac8589b52b71d6402064f5 SHA512 fe268da4ace408a1228ecfd2e93b31e60aa62f9df82d234be44c823799be19b483ebc236631e85a20ddadae502394272ff25ea9c32e15f26ca57ba92c6b42b2d WHIRLPOOL 9b66fe4c356cd6f470e9f4fd21da0d587db37d64ec9948108bd88ad3924fa08e7373193a8fd5d285e36ec11d96e7be46af1e90caddc71f754715706739cbabd1
DIST sqlite-src-3080200.zip 5522243 SHA256 aede689b0ce255036fa3631f7794dbf639438617343503c73a9e9c518fe386cf SHA512 65969b214d88e66c9ad55d78b6a1f624eab427679f8b21dc694aa843346d7891bf267e65380222220304ecd2561138ceb236fbea619a25000f03ea89dd7b26e2 WHIRLPOOL 1fe1d1c482c025c7cc28a3822088d04d39824db0b61e56782df15dc62383ab30409302dc6fbbbd2f36c3333dc3fc7539214038cf58be8e73cc6e0b25bc11a586
DIST sqlite-src-3080300.zip 5552384 SHA256 801af0d50c8bf0b648383a0a2c8f2b41a6d51aae9fda1ae9e64205410117c642 SHA512 f0a1fbd54e8da9fc5374b7a0a286439346c4c1753c9382f934c197f7111c5a3c0504961123691c9bea15d0058f13c53f4171735bd218fdec5922ca87606edb37 WHIRLPOOL 4123be5a67b93abde5873a218efbe1e89893b27ab455a6047425a861f368f89ac65c9eb58c49f321b4078e910b3bb30c50501607eb0dc64262f82ec5df489efb
DIST sqlite-src-3080301.zip 5552847 SHA256 6701bf76f41cd2637081c86481a988be4284c805a5b509ce0f1a71b92c18d8cb SHA512 689601b3dfcecff05b609e4e75314ca247f2a152246ce096b855d605ccc0ddbec009b3468e7ed14bb341e2eaf1dfe9edde495d0e955f832c6817997e6bc898e6 WHIRLPOOL 762bf47a6ee45b6cca8187394475b589056d2d08125b5026c17145b00e5cdf36493d894ef0373f3d321337d65d65893f83aa15b0e99c97466b8f4a45b0d8bdf3

@ -0,0 +1,167 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.3.1.ebuild,v 1.1 2014/02/11 23:58:21 floppym Exp $
EAPI="5"
inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
DOC_PV="${SRC_PV}"
# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
DESCRIPTION="A SQL Database Engine in a C Library"
HOMEPAGE="http://sqlite.org/"
SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
tcl? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
!tcl? (
test? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
!test? ( http://sqlite.org/2014/${PN}-autoconf-${SRC_PV}.tar.gz )
)"
LICENSE="public-domain"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test"
RDEPEND="icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
readline? ( sys-libs/readline[${MULTILIB_USEDEP}] )
tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r14
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
DEPEND="${RDEPEND}
doc? ( app-arch/unzip )
tcl? ( app-arch/unzip )
test? (
app-arch/unzip
dev-lang/tcl[${MULTILIB_USEDEP}]
)"
amalgamation() {
use !tcl && use !test
}
pkg_setup() {
if amalgamation; then
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
else
S="${WORKDIR}/${PN}-src-${SRC_PV}"
fi
}
src_prepare() {
if amalgamation; then
epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
else
epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
fi
eautoreconf
# At least ppc-aix, x86-interix and *-solaris need newer libtool.
# use prefix && eautoreconf
multilib_copy_sources
}
multilib_src_configure() {
# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
if amalgamation; then
if use debug; then
append-cppflags -DSQLITE_DEBUG
else
append-cppflags -DNDEBUG
fi
fi
# Support column metadata functions.
# http://sqlite.org/c3ref/column_database_name.html
# http://sqlite.org/c3ref/table_column_metadata.html
append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
# Support Full-Text Search versions 3 and 4.
# http://sqlite.org/fts3.html
append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS4_UNICODE61
# Support R*Trees.
# http://sqlite.org/rtree.html
append-cppflags -DSQLITE_ENABLE_RTREE
# Support soundex() function.
# http://sqlite.org/lang_corefunc.html#soundex
append-cppflags -DSQLITE_SOUNDEX
# Support unlock notification.
# http://sqlite.org/unlock_notify.html
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
if use icu; then
append-cppflags -DSQLITE_ENABLE_ICU
if amalgamation; then
sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
else
sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
fi
fi
# Enable secure_delete pragma.
# http://sqlite.org/pragma.html#pragma_secure_delete
if use secure-delete; then
append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
fi
# Starting from 3.6.23, SQLite has locking strategies that are specific to
# OSX. By default they are enabled, and use semantics that only make sense
# on OSX. However, they require gethostuuid() function for that, which is
# only available on OSX starting from 10.6 (Snow Leopard). For earlier
# versions of OSX we have to disable all this nifty locking options, as
# suggested by upstream.
if [[ "${CHOST}" == *-darwin[56789] ]]; then
append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
fi
if [[ "${CHOST}" == *-mint* ]]; then
append-cppflags -DSQLITE_OMIT_WAL
fi
# `configure` from amalgamation tarball does not support
# --with-readline-inc and --(enable|disable)-tcl options.
econf \
--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
--enable-threadsafe \
$(use_enable readline) \
$(use_enable static-libs static) \
$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
$(amalgamation || use_enable debug) \
$(amalgamation || echo --enable-tcl)
}
multilib_src_compile() {
emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
}
multilib_src_test() {
if [[ "${EUID}" -eq 0 ]]; then
ewarn "Skipping tests due to root permissions"
return
fi
emake $(use debug && echo fulltest || echo test)
}
multilib_src_install() {
emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
}
multilib_src_install_all() {
prune_libtool_files
doman sqlite3.1
if use doc; then
dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
fi
}

@ -2,7 +2,5 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
<longdescription lang="en">
</longdescription>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild,v 1.5 2013/12/24 16:24:53 tomwij Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild,v 1.6 2014/02/12 02:36:33 radhermit Exp $
EAPI=4
@ -17,8 +17,6 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="bindist fetch"
RDEPEND="
>=virtual/jre-1.5"
DEPEND="
@ -27,14 +25,6 @@ DEPEND="
JAVA_SRC_DIR="OSGI-OPT/src"
pkg_nofetch() {
einfo "Please download osgi.core-${PV}.jar from"
einfo " http://www.osgi.org/Download/Release4V43"
einfo "which you can find listed as"
einfo " OSGi Service Platform Release 4 Version 4.3 Core Companion Code 4.3.0"
einfo "after accepting the license, then place it in '${DISTDIR}'."
}
java_prepare() {
rm -r org || die
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild,v 1.5 2013/12/24 16:24:53 tomwij Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild,v 1.6 2014/02/12 02:36:33 radhermit Exp $
EAPI=4
@ -17,8 +17,6 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="bindist fetch"
RDEPEND="
>=virtual/jre-1.5"
DEPEND="
@ -27,14 +25,6 @@ DEPEND="
JAVA_SRC_DIR="OSGI-OPT/src"
pkg_nofetch() {
einfo "Please download osgi.core-${PV}.jar from"
einfo " http://www.osgi.org/Download/Release5"
einfo "which you can find listed as"
einfo " OSGi Core Release 5 Companion Code"
einfo "after accepting the license, then place it in '${DISTDIR}'."
}
java_prepare() {
rm -r org || die
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3-r2.ebuild,v 1.8 2012/04/30 15:38:41 grobian Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3-r2.ebuild,v 1.9 2014/02/12 07:46:29 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@ -109,6 +109,9 @@ ghc_setup_cflags() {
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_CFLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.7 2012/05/03 19:51:57 grobian Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.8 2014/02/12 07:46:29 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@ -143,6 +143,9 @@ ghc_setup_cflags() {
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild,v 1.3 2012/05/03 19:48:41 grobian Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild,v 1.4 2014/02/12 07:46:29 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@ -141,6 +141,9 @@ ghc_setup_cflags() {
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1.ebuild,v 1.4 2012/04/13 19:01:18 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1.ebuild,v 1.5 2014/02/12 07:46:29 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@ -130,6 +130,9 @@ ghc_setup_cflags() {
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.13 2013/04/25 18:47:56 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.14 2014/02/12 07:46:29 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@ -136,6 +136,9 @@ ghc_setup_cflags() {
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.2.ebuild,v 1.2 2013/04/14 08:28:34 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.2.ebuild,v 1.3 2014/02/12 07:46:29 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@ -161,6 +161,9 @@ ghc_setup_cflags() {
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.7 2013/09/29 18:22:25 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.8 2014/02/12 07:46:29 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@ -161,6 +161,9 @@ ghc_setup_cflags() {
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3.ebuild,v 1.2 2013/07/19 10:21:35 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3.ebuild,v 1.3 2014/02/12 07:46:29 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@ -160,6 +160,9 @@ ghc_setup_cflags() {
strip-flags
strip-unsupported-flags
# Cmm can't parse line numbers #482086
replace-flags -ggdb[3-9] -ggdb2
GHC_FLAGS=""
for flag in ${CFLAGS}; do
case ${flag} in

@ -1,2 +1 @@
DIST go1.1.2.src.tar.gz 9049357 SHA256 ffc7b3b46909add09cad8213d76dba34e92cc8f8e64a3ebe1a052cb22064eb70 SHA512 e8cf7e557e57f7707ac0f58bcff8bfb989e14b5271928a025a9d3eb32fc7c876271e912875f0e9efd3478a4c74d7671f24b7fee538b082fd72cd2577ad24f65c WHIRLPOOL 57c58822031882754d288e7a0267eba80af1db296e783abf10bfc85550afd991cf2f5a5f8f232e22f5a8b0fb02f45488ee1dbdf58aa6796b66f67e54e2a07dba
DIST go1.2.src.tar.gz 9519109 SHA256 9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 SHA512 c5ded60ba6db97107669146e1723fa5efbd89eb7432a6584b831549fe19f257c658a7cad19ee0033e305eb360e84fd18e67a6445ad0f945166b4d7315adbae7f WHIRLPOOL 1c0c87f01189b60c77e6b770d06bfb4ee06f1b133d9fc221d404a81ce344be5821c6c39c7e2ff91f6ac184e3d182d51a459adba91ce2bb424a54c2745e46e2c1

@ -1,12 +0,0 @@
Disable -Werror.
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -384,7 +384,6 @@ static char *proto_gccargs[] = {
"-Wno-unknown-pragmas",
"-Wno-switch",
"-Wno-comment",
- "-Werror",
"-fno-common",
"-ggdb",
"-O2",

@ -1,12 +0,0 @@
Disable -Werror.
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -384,7 +384,6 @@ static char *proto_gccargs[] = {
"-Wno-unknown-pragmas",
"-Wno-switch",
"-Wno-comment",
- "-Werror",
"-fno-common",
"-ggdb",
"-O2",

@ -1,139 +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/go/go-1.1.2.ebuild,v 1.3 2013/10/23 15:40:51 williamh Exp $
EAPI=5
export CTARGET=${CTARGET:-${CHOST}}
inherit bash-completion-r1 elisp-common eutils
if [[ ${PV} = 9999 ]]; then
EHG_REPO_URI="https://go.googlecode.com/hg"
inherit mercurial
else
SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz"
# Upstream only supports go on amd64, arm and x86 architectures.
KEYWORDS="-* amd64 arm x86"
fi
DESCRIPTION="A concurrent garbage collected and typesafe programming language"
HOMEPAGE="http://www.golang.org"
LICENSE="BSD"
SLOT="0"
IUSE="bash-completion emacs vim-syntax zsh-completion"
DEPEND="sys-apps/ed"
RDEPEND="bash-completion? ( app-shells/bash-completion )
emacs? ( virtual/emacs )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
zsh-completion? ( app-shells/zsh-completion )"
# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/linux.*/.*"
# The go language uses *.a files which are _NOT_ libraries and should not be
# stripped.
STRIP_MASK="/usr/lib/go/pkg/linux*/*.a"
if [[ ${PV} != 9999 ]]; then
S="${WORKDIR}"/go
fi
src_prepare()
{
if [[ ${PV} != 9999 ]]; then
epatch "${FILESDIR}"/${P}-no-Werror.patch
fi
epatch_user
}
src_compile()
{
export GOROOT_FINAL=/usr/lib/go
export GOROOT="$(pwd)"
export GOBIN="${GOROOT}/bin"
if [[ $CTARGET = armv5* ]]
then
export GOARM=5
fi
cd src
./make.bash || die "build failed"
cd ..
if use emacs; then
elisp-compile misc/emacs/*.el
fi
}
src_test()
{
cd src
PATH="${GOBIN}:${PATH}" \
./run.bash --no-rebuild --banner || die "tests failed"
}
src_install()
{
dobin bin/*
dodoc AUTHORS CONTRIBUTORS PATENTS README
dodir /usr/lib/go
insinto /usr/lib/go
# There is a known issue which requires the source tree to be installed [1].
# Once this is fixed, we can consider using the doc use flag to control
# installing the doc and src directories.
# [1] http://code.google.com/p/go/issues/detail?id=2775
doins -r doc include lib pkg src
if use bash-completion; then
dobashcomp misc/bash/go
fi
if use emacs; then
elisp-install ${PN} misc/emacs/*.el misc/emacs/*.elc
fi
if use vim-syntax; then
insinto /usr/share/vim/vimfiles
doins -r misc/vim/ftdetect
doins -r misc/vim/ftplugin
doins -r misc/vim/syntax
doins -r misc/vim/plugin
doins -r misc/vim/indent
fi
if use zsh-completion; then
insinto /usr/share/zsh/site-functions
doins misc/zsh/go
fi
fperms -R +x /usr/lib/go/pkg/tool
}
pkg_postinst()
{
if use emacs; then
elisp-site-regen
fi
# If the go tool sees a package file timestamped older than a dependancy it
# will rebuild that file. So, in order to stop go from rebuilding lots of
# packages for every build we need to fix the timestamps. The compiler and
# linker are also checked - so we need to fix them too.
ebegin "fixing timestamps to avoid unnecessary rebuilds"
tref="usr/lib/go/pkg/*/runtime.a"
find "${ROOT}"usr/lib/go -type f \
-exec touch -r "${ROOT}"${tref} {} \;
eend $?
}
pkg_postrm()
{
if use emacs; then
elisp-site-regen
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.2.ebuild,v 1.5 2014/01/31 16:23:52 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.2.ebuild,v 1.6 2014/02/11 17:57:09 williamh Exp $
EAPI=5
@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]]; then
else
SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz"
# Upstream only supports go on amd64, arm and x86 architectures.
KEYWORDS="-* amd64 arm x86 ~x86-fbsd"
KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd"
fi
DESCRIPTION="A concurrent garbage collected and typesafe programming language"

@ -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/go/go-9999.ebuild,v 1.14 2014/01/28 17:38:21 williamh Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.15 2014/02/11 17:57:09 williamh Exp $
EAPI=5
@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]]; then
else
SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz"
# Upstream only supports go on amd64, arm and x86 architectures.
KEYWORDS="-* ~amd64 ~arm ~x86 ~x86-fbsd"
KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd"
fi
DESCRIPTION="A concurrent garbage collected and typesafe programming language"

@ -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/icon/icon-9.5.0.ebuild,v 1.6 2014/02/08 14:54:30 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.5.0.ebuild,v 1.7 2014/02/11 14:55:00 hattya Exp $
EAPI=4
@ -13,7 +13,7 @@ DESCRIPTION="very high level language"
LICENSE="public-domain HPND"
SLOT="0"
KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="X iplsrc"
S="${WORKDIR}/icon-v${MY_PV}src"

@ -1,3 +1,4 @@
DIST polyml.5.2.1.tar.gz 4114551 SHA256 c84148ae9a28e782f48208bcb8c5b82ee7bfdc178784fe81694cf1f0789ae62e SHA512 c3971eb7765712acfe19a48c91183eb1a93b537cdcf479bc70b47676f1a5d93a1cb966839298607274d077df3419c74dcaed319e4b4c0f79e3e78c36f2af428e WHIRLPOOL e02aa5e4995b9f70a04c700bb53306ed712aaf99a8cf2ff9f0a1dd465ccbe905348b7dcad3c6b9528c1b62293f62fb917e5fa9409bd72852897a933776a2fb51
DIST polyml.5.4.1.tar.gz 6107319 SHA256 514d1d07be487b783d4dfa29dbd550b3396640579ce135a9eb5a61f08e7f9cac SHA512 4a7b404ed648b5a9fd9d52917214688d15f4f9a5f4570ba13b52a8304bde1cc4b534f539ffc3c9554283816ae130e4c898a179d776df6d3220fba9743a19b175 WHIRLPOOL 048db0b2210d699c0a86940daaafd24bfc81debae412f7e7dcad2585cd5514253f6c47e0006277ef00b640ab971a031d74e64c78c4abcc09712fa9e8593d1720
DIST polyml.5.5.1.tar.gz 5465794 SHA256 cf8009dabc8b5d308d92e201dcd01f17ce14289d30caa8021a87365f4b8e209a SHA512 283954c8bf5599d83ea69916b827b1acae7137fe4add67537026092da2e6f1a89d71d3a394dbba599bbe9e967ded1446f39f4d81afb90301532db6be949f7a6f WHIRLPOOL 5bfeb8dcedcfe9b0a925ed089abc246d70d1269631ee46e9c78b123d461afb80e68640d6c08d77f47e69b0c244e9c7a27750dd7350741911e007f9dbcb2e7f76
DIST polyml.5.5.tar.gz 5504389 SHA256 2b20e597e6fe43df1b0ed01e78e410c6b51d0ac7911833e91d94fcc9eb05d831 SHA512 4725c2e4a786b8c63bc6fc1cadad0de818ed935014d51040af43defa07b03ba7bedb2185bfb2e39a0db7284479e79e698b31ec7fe8463c306b668de1eda69b89 WHIRLPOOL 166c7d0037dff771251c95e17d86a6208d926a5adbbac0188426dfe09b7cdbab1b620919068a722f34377fbc59966145ebd1cba5dcb0664943cc82c10d3b5688

@ -0,0 +1,33 @@
http://sourceforge.net/p/polyml/code/1875/
Required for sci-mathematics/isabelle-2013.2
------------------------------------------------------------------------
r1875 | dcjm | 2013-10-30 10:49:05 -0600 (Wed, 30 Oct 2013) | 1 line
Backport commit 1874 from trunk. This fixes TextIO.inputN and StreamIO.inputN so they return immediately if the request is for zero characters.
Index: polyml/basis/BasicStreamIO.sml
===================================================================
--- polyml/basis/BasicStreamIO.sml (revision 1851)
+++ polyml/basis/BasicStreamIO.sml (working copy)
@@ -213,6 +213,8 @@
fun inputN (f, n) =
if n < 0
then raise Size
+ else if n = 0 (* Defined to return the empty vector and f *)
+ then (emptyVec, f)
else
let
val (vecs, f') = inputNList (f, n)
Index: polyml/basis/TextIO.sml
===================================================================
--- polyml/basis/TextIO.sml (revision 1851)
+++ polyml/basis/TextIO.sml (working copy)
@@ -597,6 +597,8 @@
| inputN' n (ref(Direct(strm as {buffer, bufp, buflimit, ...}))) =
if n < 0 orelse n > CharVector.maxLen
then raise Size
+ else if n = 0
+ then "" (* Return the empty string without blocking *)
else if !buflimit = 0
then (* Last read returned end-of-file. Clear the EOF state once
we return this empty string. *)

@ -0,0 +1,29 @@
--- polyml.5.5.1-orig/libpolyml/memmgr.cpp 2013-07-10 22:56:07.000000000 +1000
+++ polyml.5.5.1/libpolyml/memmgr.cpp 2014-02-10 14:08:51.866219101 +1100
@@ -80,7 +80,7 @@
// Allocate the heap itself.
size_t iSpace = size*sizeof(PolyWord);
bottom =
- (PolyWord*)osMemoryManager->Allocate(iSpace, PERMISSION_READ|PERMISSION_WRITE|PERMISSION_EXEC);
+ (PolyWord*)osMemoryManager->Allocate(iSpace, PERMISSION_READ|PERMISSION_EXEC);
if (bottom == 0)
return false;
@@ -359,7 +359,7 @@
// Allocate the memory itself.
size_t iSpace = size*sizeof(PolyWord);
space->bottom =
- (PolyWord*)osMemoryManager->Allocate(iSpace, PERMISSION_READ|PERMISSION_WRITE|PERMISSION_EXEC);
+ (PolyWord*)osMemoryManager->Allocate(iSpace, PERMISSION_READ|PERMISSION_EXEC);
if (space->bottom == 0)
{
@@ -728,7 +728,7 @@
LocalMemSpace *space = lSpaces[i];
if (! space->isMutable)
osMemoryManager->SetPermissions(space->bottom, (char*)space->top - (char*)space->bottom,
- on ? PERMISSION_READ|PERMISSION_EXEC : PERMISSION_READ|PERMISSION_EXEC|PERMISSION_WRITE);
+ on ? PERMISSION_READ|PERMISSION_EXEC : PERMISSION_READ|PERMISSION_WRITE);
}
}
}

@ -0,0 +1,141 @@
http://sourceforge.net/p/polyml/code/1869/
Required for sci-mathematics/isabelle-2013.2
------------------------------------------------------------------------
r1869 | dcjm | 2013-10-11 05:59:58 -0600 (Fri, 11 Oct 2013) | 1 line
Back-port commits 1855 and 1867 from trunk. These fix two optimiser bugs. Includes the regression tests.
Index: polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml
===================================================================
--- polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml (revision 1851)
+++ polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml (working copy)
@@ -645,8 +645,9 @@
(thisDec :: decs, thisArg @ args, LoadLocal newAddr :: mapList)
end
- | mapPattern(ArgPattCurry(currying, ArgPattTuple{allConst=false, filter, ...}) :: patts, n, m) =
- (* It's a function that returns a tuple. *)
+ | mapPattern(ArgPattCurry(currying as [_], ArgPattTuple{allConst=false, filter, ...}) :: patts, n, m) =
+ (* It's a function that returns a tuple. The function must not be curried because
+ otherwise it returns a function not a tuple. *)
let
val (thisDec, thisArg, thisMap) =
transformFunctionArgument(currying, [LoadArgument m], [LoadArgument n], SOME filter)
@@ -657,7 +658,7 @@
| mapPattern(ArgPattCurry(currying as firstArgSet :: _, _) :: patts, n, m) =
(* Transform it if it's curried or if there is a tuple in the first arg. *)
- if List.length currying >= 2 orelse
+ if (*List.length currying >= 2 orelse *) (* This transformation is unsafe. *)
List.exists(fn ArgPattTuple{allConst=false, ...} => true | _ => false) firstArgSet
then
let
@@ -685,6 +686,13 @@
and transformFunctionArgument(argumentArgs, loadPack, loadThisArg, filterOpt) =
let
+ (* Disable the transformation of curried arguments for the moment.
+ This is unsafe. See Test146. The problem is that this transformation
+ is only safe if the function is applied immediately to all the arguments.
+ However the usage information is propagated so that if the result of
+ the first application is bound to a variable and then that variable is
+ applied it still appears as curried. *)
+ val argumentArgs = [hd argumentArgs]
(* We have a function that takes a series of curried argument.
Change that so that the function takes a list of arguments. *)
val newAddr = ! localCounter before localCounter := ! localCounter + 1
@@ -1214,9 +1222,11 @@
let
fun checkArg (ArgPattTuple{allConst=false, ...}) = true
(* Function has at least one tupled arg. *)
- | checkArg (ArgPattCurry(_, ArgPattTuple{allConst=false, ...})) = true
- (* Function has an arg that is a function that returns a tuple. *)
- | checkArg (ArgPattCurry(_ :: _ :: _, _)) = true
+ | checkArg (ArgPattCurry([_], ArgPattTuple{allConst=false, ...})) = true
+ (* Function has an arg that is a function that returns a tuple.
+ It must not be curried otherwise it returns a function not a tuple. *)
+ (* This transformation is unsafe. See comment in transformFunctionArgument above. *)
+ (*| checkArg (ArgPattCurry(_ :: _ :: _, _)) = true *)
(* Function has an arg that is a curried function. *)
| checkArg (ArgPattCurry(firstArgSet :: _, _)) =
(* Function has an arg that is a function that
Index: polyml/Tests/Succeed/Test146.ML
===================================================================
--- polyml/Tests/Succeed/Test146.ML (revision 0)
+++ polyml/Tests/Succeed/Test146.ML (revision 1875)
@@ -0,0 +1,24 @@
+(* Bug in transformation of arguments which are curried functions. It is not
+ safe to transform "f" in the argument to "bar". Although it is curried
+ the application to the first argument "()" is not immediately followed
+ by the application to the second. *)
+
+local
+ val r = ref 0
+in
+ (* Foo should be called exactly once *)
+ fun foo () = (r:= !r+1; fn i => i)
+
+ fun checkOnce () = if !r = 1 then () else raise Fail "bad"
+end;
+
+fun bar f = let val r = f() in (r 1; r 2; List.map r [1, 2, 3]) end;
+
+bar foo;
+
+checkOnce();
+
+exception A and B and C;
+fun rA () = raise A and rB () = raise B;
+fun h (f, g) = let val a = f() in g(); a () end;
+h(rA, rB) handle A => ();
Property changes on: polyml/Tests/Succeed/Test146.ML
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: polyml/Tests/Succeed/Test147.ML
===================================================================
--- polyml/Tests/Succeed/Test147.ML (revision 0)
+++ polyml/Tests/Succeed/Test147.ML (revision 1875)
@@ -0,0 +1,31 @@
+(* Bug in optimiser transformation. A function argument that returns a tuple
+ can be transformed to take a container but only if it is not curried. *)
+
+(* Cut down example from Isabelle that caused an internal error exception. *)
+
+fun one _ [] = raise Fail "bad"
+ | one pred (x :: xs) =
+ if pred x then (x, xs) else raise Fail "bad";
+
+fun foo (scan, f) xs = let val (x, y) = scan xs in (f x, y) end;
+
+fun bar (scan1, scan2) xs =
+ let
+ val (x, ys) = scan1 xs;
+ val (y, zs) = scan2 x ys;
+ in ((x, y), zs) end;
+
+fun bub (scan1, scan2) = foo(bar(scan1, (fn _ => scan2)), op ^);
+
+val qqq: string list -> string * int = bub(one (fn _ => raise Match), (foo((fn _ => raise Match), String.concat)));
+
+(* Further example - This caused a segfault. *)
+
+PolyML.Compiler.maxInlineSize := 1;
+fun f g = let val (x,y) = g 1 2 in x+y end;
+
+fun r (x, y, z) = fn _ => (x, y+z);
+
+val h: int-> int*int = r (4,5,6);
+
+f (fn _ => h);
Property changes on: polyml/Tests/Succeed/Test147.ML
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property

@ -0,0 +1,72 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.5.1.ebuild,v 1.1 2014/02/11 14:35:09 gienah Exp $
EAPI="5"
inherit base autotools pax-utils
MY_P="${PN}.${PV}"
DESCRIPTION="Poly/ML is a full implementation of Standard ML"
HOMEPAGE="http://www.polyml.org"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="X elibc_glibc +gmp portable test +threads"
RDEPEND="X? ( x11-libs/motif )
gmp? ( >=dev-libs/gmp-5 )
elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
virtual/libffi"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
PATCHES=(
# Bug 256679 - patch the assembler code. The remaining executable stacks in ./.libs/poly
# comes from the polyml generated ./polyexport.o file.
"${FILESDIR}/${PN}-5.5.0-asm.patch"
# http://sourceforge.net/p/polyml/code/1875/ for isabelle-2013.2
"${FILESDIR}/${PN}-5.5.1-inputN-return-for-zero-chars.patch"
# http://sourceforge.net/p/polyml/code/1869/
# Adds Test146.ML that fails, applying it anyway as it is required by
# sci-mathematics/isabelle-2013.2
"${FILESDIR}/${PN}-5.5.1-optimize-closure.patch"
)
src_prepare() {
base_src_prepare
eautoreconf
if [ -f "${S}/Tests/Succeed/Test146.ML" ]; then
mv "${S}/Tests/Succeed/Test146.ML" "${S}/Tests/Succeed/Test146.ML.disable-test-as-it-fails"
fi
}
src_configure() {
econf \
--enable-shared \
--disable-static \
--with-system-libffi \
$(use_with X x) \
$(use_with gmp) \
$(use_with portable) \
$(use_with threads)
}
src_compile() {
# Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
pushd libpolyml || die "Could not cd to libpolyml"
emake
popd
emake polyimport
pax-mark m "${S}/.libs/polyimport"
emake
pax-mark m "${S}/.libs/poly"
}
src_test() {
emake tests || die "tests failed"
}

@ -9,14 +9,19 @@ DIST forkjoin.jar 60850 SHA256 4007ca649f037ed5ecc87c74529f499b75ed1a0f3f78e8f82
DIST genericNest.jar 1136 SHA256 c2c23341eec9fb379b57d7bf1156fedb3e2b9f97d2d5729fbfc7d766fd390faa SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6 WHIRLPOOL 61b2d9f840fc0ed86a8207cf353a2f7b9bf8523d31b4e8f74eb21ecac1a405ed04c5a4a8e78a13d64b2dd186a7ec3885cd5e2514ad572e600e5744c3f15f74c5
DIST instrumented.jar 31725 SHA256 8a424c8bd5805ec429a9477cbd0f44bf65a2b79b720d438bfd347dba8da06484 SHA512 b1d77c4380a2b8ffe715ec106e58081e5c89e314c5a13071d627c3f974144ad453e79d405cd722d75095b62e8682b7414d40b691506c7d2f5dde62e2fce51e39 WHIRLPOOL 5ef8ee89b3fa66bf5025fd1b5db65d4d628b3452ba8530e3c3b1dd530fb5286fe3acee2cf56de09148cf2d37968626708690cc03da202cf3d58159cfd56fe8bc
DIST jline.jar 164623 SHA256 813f2bc34a096cc7780c6946acf401c82e739cf9d5359edf414f74662137d3b1 SHA512 2d97f0d1bc1df67423f54102f8b360a6dba0bfac67ba12673e781d9461485a6124cf985cbab96283af7b366a8fb53e526aa667ccec466aae7002d5030f2e1369 WHIRLPOOL a7c848acf502c2247d0a9c83fa45295e5ede7487ac2129e50d4bd05a0271050b274cd25af24fb4215dc20283ca7df750618b31fea8973fffa125a3fb37f33bf3
DIST jsr166_and_extra.jar 728574 SHA256 e33a59e291bae8dbd2b37c6a4d5eae459a313db3a588f42c59ac5fd8edf6e13b SHA512 40d949cfefc5111c79b79f085657d56aa046d1b318e6ad78de5869f61a6515c2076b70344be5ae3fb93a7b3f54f46a129e2536515b258e0d5bf2e670c5001306 WHIRLPOOL ef8414d7862736cf072ff60fff5008f38dadcf826364cf21929fdfca7d331872d8097e6a6907dd500ef5d5a68964d8c2ed9ebeedf6470dc25ede269c1a8172b5
DIST maven-ant-tasks-2.1.1.jar 1314262 SHA256 b8891b4a90aca2793ad385ab57216f51c4879c6ab7e927354f407b46510cab51 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68 WHIRLPOOL 73c44ea6aba4a3c697f64d08475b4c17bdc929ac9f320a25714fbe7cdc2939ad334deb7a90eb6c950cce8ba402d19bc2615a104788bafed7d247b997d3146743
DIST methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2a025dcf05378d9c6 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71 WHIRLPOOL d5362d5fc2795ff0671f386429840bb4f84173f9308e34c2b0eb585fb7cacbd308ab87c42f2fd407597abc4f010e8ffde600dd30addcd63c2d71c2d5f22f1582
DIST msil.jar 298973 SHA256 5b9e6dc2f4dd79644a1480b7cb4db053d73fc5d0e41015b95f15ec4dacf2da0a SHA512 1e9be7bfea639cffd638c78b4368f599753e8bd4df8f9b3c192b72c2860d6f96002c94fcf751e9c6cdacfead1ae3bd851d61395ce83c49d66f801284bd2046dd WHIRLPOOL 3828f08bb47f038d3f6e52c0d077cdecd06195de3d29b326833f47a6713bbab644ddcd20b8d39aa814d25637dae31adc1d0f0aec6f489857d7b115aeab29a301
DIST nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
DIST plugins.jar 4181 SHA256 13313e0c3a42bb401377ab4f228e3c81db482c8f33295c6a1d021fc3c9727871 SHA512 d44427df9acf4611acb492b6268b65f63a8be2d47ef29598bf5d242f702af57f0ee2eff52378b8371755d5ddf58c79d48b18a6a056ee9fee5091e478ce5ec1a2 WHIRLPOOL b2e846b5965ea7f04844b4c49e3fcc2f5b3f0e31669a662557bd36a113dd94372bae55d46f1986e03099c6f51217bf10986e5e265874854ba479c36d041a1e41
DIST push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
DIST scala-2.10.2-gentoo-binary.tar.bz2 42071067 SHA256 0e47e9585c67971f319782fe81214fd7babfbc8cfb28108f5dc3f12d16bb0f35 SHA512 e207c4b12f5c89e24d48c37a3342280bf93447c053ae2bc58a5b389439633d332eaa444119d73967e23bedd36b0f4349d6d075469e7cefa1d2f7dce32dfb6af7 WHIRLPOOL 52bdd96fc742904bc222a3944adf33898b3a07b28868ee598852554b00f677294522332eecd293fb8c62dc6800a0264ddb9167b36054a37040323277de5d884a
DIST scala-2.10.2-maven-deps.tar.gz 12324758 SHA256 0880b9f2ab27e2e5afa315bcfd84a5fa7348f0b0d6e4184ad2793862df939676 SHA512 4ddf0b76724609940fe732335b3b34ea41405bbf39d91312b4db3b79d5682c0ef98020b7e0dabf098acc94d782300e47c7b80ae1f6f1b82f4358de859086575f WHIRLPOOL 8d13459a2026b9e304d649aa93abab200648ab3f54d1b870572d2a0a4526b7fc7c5febd2e2e65d7d032404036a8db2d2cb46a88cd41474735e569008359e13b4
DIST scala-2.10.2.tar.gz 5526015 SHA256 c0b7e41924a2673e8cdf8af364e5c3249f7c52a5f931693301493ed71cc7ef32 SHA512 61be047c50f5919c1ba3e4f665a1a1f4c6f7fcf5061f94816e385b97fdec139e381cc2a3df720b3679c3056cbc5baa6d4f8cf1e53923c5b5cad37f522557dc85 WHIRLPOOL 8bf09843bc824941ae4be7875515c4c03f68fa865f1b56180bedef0c9b8e8328badc091d4eff655df3cf7729a39f117e9f129f4b7eb388cb27361d8bc611857f
DIST scala-2.10.3-gentoo-binary.tar.bz2 45352632 SHA256 f9ecad6bf7c59496233ad080c9b11cd75ca28e324e368c0551665837cc10e2d6 SHA512 1e61748e68d32c88cc1e6812514a37f15894220d0256237bf82897dfc9f5f0b2d0d9c4f6536e49daf62f72113d4e43635d2abd93d848ab828a0e67e2a5c6ef68 WHIRLPOOL 9f2717d926622a0cf4bf61aa140dca6d1c8a95dc397b16b32e00ce2979b8bd2347608ce4eb3a30e1721b852b50a85358f564e8718994a2957914efd06420a37a
DIST scala-2.10.3-maven-deps.tar.gz 5715856 SHA256 1fdabc22fdef4ddd7ed31dbedf97e216cdd11d27d702475f30d0b459da8f22f8 SHA512 c05555d07777e0c325aadfcec1cd10381cdc95945acc262925992918fcc321e51a20454dd19b4111b1fdcc14bd32e34ba5fe853e45e9b4467771186242a85335 WHIRLPOOL 11773fc2862fa0a27b4ad204dafd4723b478552f1557180b316932edc3657d3e68b1f8ce12a9bfbedf55598c656a196850586fbe7998fb2a28f4fd58cf5d1c55
DIST scala-2.10.3.tar.gz 5570015 SHA256 4cd9c67d73fb98942b78982bcfc8f4da8522e3fb3dc3210dfb7f60f749389d29 SHA512 b78d8d6a759b3de8010093dfc4104a86b0084fc466bd739ea12a7b015aef07a09e6793c4d0bb146904faf1a0cf6f60e6ea68843aef6616b7dc682a3f3e89e528 WHIRLPOOL 41caa0c54363c116c023f60699fe9074abea646acd4dcaa24336a8925d3f04ef1443a4ed397c90e966374d99097663315c47bc9088725276c91986bd4a99f45a
DIST scala-2.9.0.1-gentoo-binary.tar.bz2 33234044 SHA256 e44fbdace22ecf09aad8d10975c42758cc94e7d3caef9a30fe921b05188b8282 SHA512 1499ac0c2cc916ae0108dd3560e769e40441622580cbbeb32aa37048e6818499d3240f6045f4adeacf7e86a8d45582ea548bb37acc2070d12a2f15f9a25f722c WHIRLPOOL 03548a939001427f024e218c686dd859d94e73ecabeae6462c9e6e451457621be9bdb46c91c43653eacc7892bfbffcd37fb2a3421a8a9c25aae18d9297eeba01
DIST scala-2.9.0.1.tar.xz 29707920 SHA256 97e0d2262e4df8f936c70670849299deba69e981f783250d819733e52dbe7f96 SHA512 be1ab7589125b994e6512b38d7e5fe4c07e9f2c614ee41662a75ac4c8666faefa46e525681fbca9509b1d1db86c51f25d1a98ac67739de077b3a54adb4baf441 WHIRLPOOL 05abba93be924972d8acf76b720feb0534af0650d05bc71a7439242314c16b66c03eca05c6b00d229725239d1bbb01d1a7fd1470284c2bccac5cf0e78e930b4b
DIST scala-2.9.1-gentoo-binary.tar.bz2 33266793 SHA256 b118c285ba6655974a647a5a82e3e655487e55aff6a5b89ddf5295595d6c822a SHA512 08b9354cdc542e52b4cab2b5e67131757f635a1da8118d5c8dd015f49d9f84f1647a60a9ff5936e49441fbec71596fc8616aa494ca9cc9da851acd3ab1b5210e WHIRLPOOL 47561a90d5af3c93e17ff1cb5c9f601deb1156303a7c0ec53c43838e3f62a229e1a5c10c108fb29fdfab4d3e4c8160b02147ec3d9656ff5567b50bc75cfa00b0
@ -30,4 +35,5 @@ DIST scala-library.jar 7113040 SHA256 66057366dc9c541d0fadb7f64a4e06f7c5c86a90b2
DIST scala-reflect-src.jar 467879 SHA256 45846f176eba3e072282b597fbea58977e1ac08d7161571e2601a86adbff4e35 SHA512 c172be4d0ec724be4f62cbcaf848a71c99cffc706fcaa5b46fe2970088ba9a8f406d42728f64a0dfdef1cbe18e313b8be8142d68b9b3d7a592dec5e1fd7366b6 WHIRLPOOL 876bd9e3186d76d351e128cf990789459b51bca1ad6e4f51aa397d1941311ed51a1048188a4b94bd8709551c0cb3ab3985d3a1534594bb840082d0b555496d7c
DIST scala-reflect.jar 3307596 SHA256 910b58279250371e034859227fb5d9015297eb6bf607f9d3ec0836a822c1fff0 SHA512 466c55b8ce98e48f851c446b986388351ac4b0fb2b0cf6888d56fe2a4af1f5f3916e78f3fdea395ee18ef0a5128bc6b0d4cdcdce8f5b0f2fcc30c2bdbd41eb40 WHIRLPOOL 73a42b7b557bf29d14511f798e22f1ba8039e7c41bb165d9a4be7c66d393fa63c2836239fca56158eb2c5dd07567b1febb18d9f4f514de48e0c6ec5d155a46a2
DIST scalacheck.jar 763570 SHA256 96814bea5818186086473da5c657191d03145649eee0c300abec9c3380fdd418 SHA512 5383e80dbcb11cb3fba033bd6a0e8c220ec3dd6fc153062b9d44d346ff17bea014a8c7a412af85ff487a34011cdc2042191c4c4ad66ea44eb7eba139a0b358d4 WHIRLPOOL d6276010ce4d1bcc647e1d7673cc18f645ac92abf03c4aa5be03735853a33692763883fcd8e325d36b2a18cca758d6f1636294b182f247da1094c82476f36b58
DIST scalatest.jar 1827900 SHA256 43869b4171972901bce5a89b1ba8b8474c7e75538321dcdfb41e37d089edbac8 SHA512 2d77d1239d544d572660d8b2a8355bf7a03137a3d05d41b5f2ab214edab05ef038d3e05082d5adafe16b6cda41440c075f49a130c3c7ff053c6d8844000d2f2b WHIRLPOOL 68d804ab21f3caa0e459d8d8b1c926b6f69140cb64a96b72d95605f9f04845510cd47b369b3d73d5e944912fa2f0d06cfb02c75f89087d8f27effbdfa4d9ccd1
DIST vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99

@ -0,0 +1,75 @@
--- scala-2.10.3-orig/build.xml 2013-09-23 23:00:37.000000000 +1000
+++ scala-2.10.3/build.xml 2014-02-09 13:34:45.323120848 +1100
@@ -206,11 +206,9 @@
on repeated use of artifact:dependencies
-->
<if><not><isset property="maven-deps-done"></isset></not><then>
- <mkdir dir="${user.home}/.m2/repository"/>
- <!-- This task has an issue where if the user directory does not exist, so we create it above. UGH. -->
- <artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset">
- <dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
- </artifact:dependencies>
+ <path id="extra.tasks.classpath">
+ <pathelement path="BNDLIB_CLASSPATH"></pathelement>
+ </path>
<!-- JUnit -->
<property name="junit.version" value="4.10"/>
@@ -219,23 +217,14 @@
</artifact:dependencies>
<!-- Pax runner -->
- <property name="pax.exam.version" value="2.5.0"/>
- <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
- <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
- <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.4.0"/>
- <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
- <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
- <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>
- <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
- <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
- </artifact:dependencies>
-
-
- <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset" versionsId="partest.extras.versions">
- <dependency groupId="com.googlecode.java-diff-utils" artifactId="diffutils" version="1.3.0"/>
- </artifact:dependencies>
+ <path id="pax.exam.classpath">
+ <pathelement path="PAX_RUNNER_CLASSPATH"></pathelement>
+ </path>
+
+ <path id="partest.extras.classpath">
+ <pathelement path="DIFFUTILS_CLASSPATH"></pathelement>
+ </path>
+ <property name="partest.extras.versions" value="1.3.0"></property>
<!-- BND support -->
<typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
@@ -1266,10 +1255,8 @@
<!-- depend on quick.done so quick.bin is run when pack.done is -->
<target name="pack.done" depends="quick.done, pack.bin">
<!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks -->
- <copy todir="${build-pack.dir}/lib">
- <resources refid="partest.extras.fileset"/>
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
- from="${partest.extras.versions}" to="flatten"/>
+ <copy todir="${build-pack.dir}/lib" flatten="true">
+ <path><path refid="partest.extras.classpath"/></path>
</copy>
<taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.compiler.path"/>
@@ -1827,10 +1814,8 @@
</fileset>
</copy>
- <copy todir="${dist.dir}/lib">
- <resources refid="partest.extras.fileset"/>
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
- from="${partest.extras.versions}" to="flatten"/>
+ <copy todir="${dist.dir}/lib" flatten="true">
+ <path><path refid="partest.extras.classpath"/></path>
</copy>
<mkdir dir="${dist.dir}/bin"/>

@ -0,0 +1,24 @@
--- scala-2.10.3-orig/tools/get-scala-commit-date 2013-09-23 23:00:37.000000000 +1000
+++ scala-2.10.3/tools/get-scala-commit-date 2014-02-09 14:14:29.132553839 +1100
@@ -10,8 +10,8 @@
[[ $# -eq 0 ]] || cd "$1"
-lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
-lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
+lastcommitdate="2013-09-23"
+lastcommithours="00:00:00"
# 20120324
echo "${lastcommitdate//-/}-${lastcommithours//:/}"
--- scala-2.10.3-orig/tools/get-scala-commit-sha 2013-09-23 23:00:37.000000000 +1000
+++ scala-2.10.3/tools/get-scala-commit-sha 2014-02-09 14:08:46.878352444 +1100
@@ -12,7 +12,7 @@
# printf %016s is not portable for 0-padding, has to be a digit.
# so we're stuck disassembling it.
-hash=$(git log -1 --format="%H" HEAD)
+hash="e2fec6b28dfd73482945ffab85d9b582d0cb9f17"
hash=${hash#g}
hash=${hash:0:10}
echo "$hash"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2.ebuild,v 1.2 2013/08/30 13:55:11 gienah Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2.ebuild,v 1.3 2014/02/12 13:46:58 gienah Exp $
EAPI="5"
JAVA_PKG_IUSE="doc examples source"
@ -117,7 +117,7 @@ java_prepare() {
done
# gentoo patch (by gienah) to stop it calling git log in the build
epatch "${FILESDIR}/${PN}-2.10.2-no-git.patch"
if has_version ">=virtual/jdk-1.7.0"; then
if java-pkg_is-vm-version-ge "1.7" ; then
# This patch bumped to 2.10.2: http://pkgs.fedoraproject.org/cgit/scala.git/tree/scala-2.10.0-java7.patch
epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing.patch"
fi

@ -0,0 +1,270 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.3.ebuild,v 1.1 2014/02/12 13:46:58 gienah Exp $
EAPI="5"
JAVA_PKG_IUSE="doc examples source"
JAVA_ANT_DISABLE_ANT_CORE_DEP="yes"
EANT_TEST_TARGET="test.suite"
inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
MY_P="${PN}-sources-${PV}"
# creating the binary:
# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc examples source" ebuild scala-*.ebuild compile
# cd $WORDKIR
# fix dist/latest link.
# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/TODO
# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
# to search for .desired.sha1 files, which contain sha1 hashes that are appended
# to ${BURI} along with the subdirectory and filename to form the list of jar files
# listed in SRC_URI. The output of this find command can be hacked into the desired format:
# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print
# After editing it into the desired format: sort -t / -k 3 file
BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
declare -a JURI=( \
${BURI}/8b6ba65c8146217333f0762087fe2340d572e832/docs/examples/plugintemplate/lib/scalatest.jar \
${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar \
${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar \
${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar \
${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar \
${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar \
${BURI}/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar \
${BURI}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar \
${BURI}/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar \
${BURI}/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar \
${BURI}/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar \
${BURI}/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar \
${BURI}/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar \
${BURI}/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar \
${BURI}/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar
${BURI}/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar \
${BURI}/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar \
${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar \
${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar \
${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar \
${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar \
${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar \
${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar \
${BURI}/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar \
${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar \
${BURI}/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar \
${BURI}/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar \
${BURI}/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar \
${BURI}/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar \
${BURI}/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar \
${BURI}/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar \
${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar \
)
DESCRIPTION="The Scala Programming Language"
HOMEPAGE="http://www.scala-lang.org/"
SRC_URI="!binary?
( https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
${JURI[@]}
http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
)
binary? ( http://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="binary emacs"
COMMON_DEP="dev-java/ant-core:0
dev-java/bndlib:0
dev-java/hawtjni-runtime:0
dev-java/junit:4"
DEPEND="${COMMON_DEP}
>=virtual/jdk-1.6.0
<virtual/jdk-1.8.0
java-virtuals/jdk-with-com-sun:0
!binary? (
dev-java/ant-core:0
dev-java/ant-contrib:0
dev-java/ant-nodeps:0
)
app-arch/xz-utils:0"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
!dev-java/scala-bin:0"
PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
S="${WORKDIR}/${P}"
CHECKREQS_MEMORY="1532M"
pkg_setup() {
java-pkg-2_pkg_setup
if ! use binary; then
debug-print "Checking for sufficient physical RAM"
ewarn "This package can fail to build with memory allocation errors in some cases."
ewarn "If you are unable to build from sources, please try USE=binary"
ewarn "for this package. See bug #181390 for more information."
check-reqs_pkg_setup
fi
}
src_unpack() {
if use binary ; then
mkdir -p "${S}" || die
cd "${S}" || die
fi
# Unpack tar files only.
for f in ${A} ; do
[[ ${f} == *".tar."* ]] && unpack ${f}
done
}
java_prepare() {
java-pkg_getjars ant-core,bndlib,hawtjni-runtime,junit-4
if ! use binary; then
local j
for j in "${JURI[@]}"
do
cp -p "${DISTDIR}/${j##*/}" "${S}/${j#${BURI}/*/}" || die
done
# gentoo patch (by gienah) to stop it calling git log in the build
epatch "${FILESDIR}/${P}-no-git.patch"
if java-pkg_is-vm-version-ge "1.7" ; then
# This patch bumped to 2.10.2: http://pkgs.fedoraproject.org/cgit/scala.git/tree/scala-2.10.0-java7.patch
epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing.patch"
sed -e "s@above is a message from the scala 2.10.2 release@above is a message from the scala ${PV} release@" \
-i "${S}/build.xml" \
|| die "Could not correct scala version message"
fi
# Note: to bump scala, some things to try are:
# 1. update all the sha1s in JURI
# 2. comment out applying the maven-deps patch and all the stuff here up to and including the sed of build.xml
# 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORDIR}/.m2
# 4. If it does download more stuff to ${WORDIR}/.m2, then tar up the stuff in ${WORDIR}/.m2 and add
# ${P}-maven-deps.tar.gz in SRC_URI to point to it.
# Add this stuff to ${P}-maven-deps.tar.gz as well (or to portage)
# tar cvf scala-2.10.3-maven-deps.tar .m2/repository/biz/aQute/bnd \
# .m2/repository/com/googlecode/java-diff-utils/diffutils/ .m2/repository/org/ops4j/
# 5. uncomment the maven-deps patch apply and all the stuff up to and including the sed of build.xml
# 6. the hash in ${P}-no-git.patch should be updated by searching for hash matching the scala release
# tag, so that the source code hyper-links in the scala documentation will point to the correct version of
# the source code.
# Bug 482192
epatch "${FILESDIR}/${PN}-2.10.3-maven-deps.patch"
# we have $(java-config -p bndlib) in portage, but not bnd.
local bnd_classpath=""
for i in $(find "${WORKDIR}/.m2/repository/biz/aQute/bnd" -type f -name *.jar -print)
do
if [ -z "${bnd_classpath}" ]
then
bnd_classpath="${i}"
else
bnd_classpath="${bnd_classpath}:${i}"
fi
done
bnd_classpath="${bnd_classpath}:$(java-config -p bndlib)"
# pax runner appears to only be used in the tests
local paxrunner_classpath=""
for i in $(find "${WORKDIR}/.m2/repository/org/ops4j/" -type f -name *.jar -print)
do
if [ -z "${paxrunner_classpath}" ]
then
paxrunner_classpath="${i}"
else
paxrunner_classpath="${paxrunner_classpath}:${i}"
fi
done
paxrunner_classpath="${paxrunner_classpath}:$(java-config -p junit-4)"
# DiffUtils does not appear to be in portage. It is placed in ${partest.extras.classpath} and
# copied to ${build-pack.dir}/lib in ${PN}-2.10.2-maven-deps.patch.
local diffutils_classpath=""
for i in $(find "${WORKDIR}/.m2/repository/com/googlecode/java-diff-utils" -type f -name *.jar -print)
do
if [ -z "${diffutils_classpath}" ]
then
diffutils_classpath="${i}"
else
diffutils_classpath="${diffutils_classpath}:${i}"
fi
done
sed -e "s@BNDLIB_CLASSPATH@${bnd_classpath}@" \
-e "s@PAX_RUNNER_CLASSPATH@${paxrunner_classpath}@" \
-e "s@DIFFUTILS_CLASSPATH@${diffutils_classpath}@" \
-i "${S}/build.xml" \
|| die "could not sed classpaths in build.xml"
# Remove this test as it fails.
# [partest] testing: [...]/files/run/parserJavaIdent.scala [FAILED]
rm -f test/files/run/parserJavaIdent.scala
fi
}
src_compile() {
if ! use binary; then
#unset ANT_OPTS as this is set in the build.xml
#sets -X type variables which might come back to bite me
unset ANT_OPTS
# reported in bugzilla that multiple launches use less resources
# https://bugs.gentoo.org/show_bug.cgi?id=282023
eant all.clean
eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
-Duser.home="${WORKDIR}" build-opt
eant dist.done
else
einfo "Skipping compilation, USE=binary is set."
fi
}
src_test() {
java-pkg-2_src_test
}
src_install() {
cd dists/latest || die
local SCALADIR="/usr/share/${PN}/"
exeinto "${SCALADIR}/bin"
doexe $(find bin/ -type f ! -iname '*.bat')
#sources are .scala so no use for java-pkg_dosrc
if use source; then
dodir "${SCALADIR}/src"
insinto "${SCALADIR}/src"
doins src/*-src.jar
fi
java-pkg_dojar lib/*.jar
doman man/man1/*.1
local docdir="doc/${PN}-devel-docs"
dodoc doc/README ../../docs/TODO
if use doc; then
java-pkg_dojavadoc "${docdir}/api"
dohtml -r "${docdir}/tools"
fi
use examples && java-pkg_doexamples "${docdir}/examples"
dodir /usr/bin
for b in $(find bin/ -type f ! -iname '*.bat'); do
local _name=$(basename "${b}")
dosym "/usr/share/${PN}/bin/${_name}" "/usr/bin/${_name}"
done
}

@ -1 +1,2 @@
DIST dbus-glib-0.100.2.tar.gz 748836 SHA256 a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5 SHA512 f7bbbeac189a724b7f95dce42e8adaf533a1d1c038521990d0eb2cb41c3f088a93d432c257a75dcce31419a55020455084d983b9471ace385c497f659a39ef59 WHIRLPOOL f5c23dab0e78fada494c3bf55c7db62bc2993789ad89a26507d499dc654d2ced22522909f191029f796bee181c4d587dad86fd72d727085add759602c3a8a90f
DIST dbus-glib-0.102.tar.gz 783792 SHA256 6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c SHA512 9bf4b33dd264eaed9ade0e35f0ad47986c31bd5e3de4d3e2fcee66a9be87000b6121bc810b9a5a24eca53190d98323b871dc78f341df8e05bd0247b096cf778f WHIRLPOOL b83f12877118dca1797c935f57a6ae664fbfc70c4d2fb2d95d2cf11abb7c326a098f336225ffb9030fac00a33d988a30038e2734721fc1ddbb5297f864e01bcf

@ -0,0 +1,92 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.102.ebuild,v 1.2 2014/02/12 16:48:27 ssuominen Exp $
EAPI=5
inherit bash-completion-r1 eutils multilib-minimal
DESCRIPTION="D-Bus bindings for glib"
HOMEPAGE="http://dbus.freedesktop.org/"
SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="|| ( GPL-2 AFL-2.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="debug doc static-libs test"
CDEPEND=">=dev-libs/expat-2[${MULTILIB_USEDEP}]
>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
>=sys-apps/dbus-1.6.2[${MULTILIB_USEDEP}]"
DEPEND="${CDEPEND}
virtual/pkgconfig
doc? ( >=dev-util/gtk-doc-1.4 )"
RDEPEND="${CDEPEND}
abi_x86_32? (
!<app-emulation/emul-linux-x86-baselibs-20131008-r8
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
# NEWS file is obsolete
DOCS=( AUTHORS ChangeLog HACKING README )
set_TBD() {
# out of sources build dir for make check
export TBD="${BUILD_DIR}-tests"
}
src_prepare() {
epatch_user
}
multilib_src_configure() {
local myconf=(
--localstatedir="${EPREFIX}"/var
--enable-bash-completion
$(use_enable debug asserts)
$(use_enable static-libs static)
$(multilib_build_binaries && use_enable doc gtk-doc || echo " --disable-gtk-doc")
)
ECONF_SOURCE="${S}" econf "${myconf[@]}"
use doc || ln -s "${S}"/doc/reference/html doc/reference/html #460042
if use test; then
set_TBD
mkdir "${TBD}"
cd "${TBD}"
einfo "Running configure in ${TBD}"
ECONF_SOURCE="${S}" econf \
"${myconf[@]}" \
$(use_enable test checks) \
$(use_enable test tests) \
$(use_enable test asserts) \
$(use_with test test-socket-dir "${T}"/dbus-test-socket)
fi
}
multilib_src_compile() {
emake
if use test; then
set_TBD
cd "${TBD}"
einfo "Running make in ${TBD}"
emake
fi
}
multilib_src_test() {
set_TBD
cd "${TBD}"
emake check
}
multilib_src_install_all() {
einstalldocs
newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
rm -rf "${ED}"/etc/bash_completion.d || die
prune_libtool_files
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.11-r1.ebuild,v 1.1 2013/11/24 10:56:48 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.11-r1.ebuild,v 1.3 2014/02/11 18:46:46 jer Exp $
EAPI=5
@ -14,7 +14,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc static-libs"
# tests break otherwise

@ -1 +1,2 @@
DIST libdbusmenu-0.6.2.tar.gz 730624 SHA256 c2077069ae36c207f0c86cb52a0066691d155e45629d1361eee14fc7a2552649 SHA512 575276fc7e1288ab276c106627791bd472349f6c49dc86ff7bbfa0c8ed11118cc622c181299f9df4f6031b12961b9bea8c79126a3bc6a8d208811784f40d2e31 WHIRLPOOL 6cb3ce67a41cfb8e5fd57b8f73412ad292f1bed612fcd04852565b9238bb74be16af820aade28d2705a57091b9f1610cc63b1a457f5afaf89e62b76f3b8fff9a
DIST libdbusmenu-12.10.2.tar.gz 735730 SHA256 9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9 SHA512 cf2e50dc3adbf35d0a4ccdd62a3efd9fae2d079b8d06e6522b70f077f89ac2cf72188e380f476e38d184b69549e90b801bf1e32174fa94bbe612dd52aec94496 WHIRLPOOL 3e75fd0bcbadcff8f4e4cd3a2be33a3aa7cf715413b1a67c5430b9420a965d64db2d988fa5c21fc42c6458ad4ed479c400b28b8a94074cb7223ab0a03ad985eb

@ -0,0 +1,74 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-12.10.2.ebuild,v 1.1 2014/02/12 10:04:56 jlec Exp $
EAPI=5
VALA_MIN_API_VERSION=0.16
VALA_USE_DEPEND=vapigen
PYTHON_COMPAT=( python{2_6,2_7} )
inherit eutils flag-o-matic python-single-r1 vala
DESCRIPTION="Library to pass menu structure across DBus"
HOMEPAGE="http://launchpad.net/dbusmenu"
SRC_URI="http://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
LICENSE="LGPL-2.1 LGPL-3"
SLOT="3"
KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
IUSE="debug gtk +introspection"
RDEPEND="
>=dev-libs/glib-2.32
>=dev-libs/dbus-glib-0.100
dev-libs/libxml2
gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
introspection? ( >=dev-libs/gobject-introspection-1 )
!<${CATEGORY}/${PN}-0.5.1-r200"
DEPEND="${RDEPEND}
app-text/gnome-doc-utils
dev-util/intltool
virtual/pkgconfig
introspection? ( $(vala_depend) )"
src_prepare() {
if use introspection; then
vala_src_prepare
export VALA_API_GEN="${VAPIGEN}"
fi
python_fix_shebang tools
}
src_configure() {
append-flags -Wno-error #414323
# dumper extra tool is only for GTK+-2.x, tests use valgrind which is stupid
econf \
--docdir=/usr/share/doc/${PF} \
--disable-static \
--disable-silent-rules \
--disable-scrollkeeper \
$(use_enable gtk) \
--disable-dumper \
$(use_enable introspection) \
$(use_enable introspection vala) \
$(use_enable debug massivedebugging) \
--with-html-dir=/usr/share/doc/${PF}/html \
--with-gtk=3
}
src_test() { :; } #440192
src_install() {
MAKEOPTS+=" -j1"
default
local a b
for a in ${PN}-{glib,gtk}; do
b=/usr/share/doc/${PF}/html/${a}
[[ -d ${ED}/${b} ]] && dosym ${b} /usr/share/gtk-doc/html/${a}
done
prune_libtool_files
}

@ -1 +1,2 @@
DIST msgpack-0.5.6.tar.gz 390841 SHA256 4d4a2b50955e35b6b8e92247ee079467b3294db2378d5bc73e83c9bbe184545b SHA512 b387531a0892f21805b3d2041d206ca6bd899bffab382ac340b0e661d5a047dc7c5585019339e3919fb553afeb2d4534251ad26a0f79637727322b89edab3dfd WHIRLPOOL cdd5d0f9e42805973806d08597168eb753a3ac841ed729bf1428fb5738b2a4a0c899949fa3d9c977415a0791c98805b586028376b518e44519f1a779abf99cbe
DIST msgpack-0.5.8.tar.gz 426292 SHA256 ce231418ba47a3a2f021ab863a600b3f2dc57a4b528138e7868642bad39b9196 SHA512 917ef496a97197bc9e95653505c586e7da7d10dc7a92d8d364b2e10802923324fbf2d1a07f72618e23dc779cac128de33b9213fe31a72a7da763632b27fb0497 WHIRLPOOL 4baccb6b053aa68cc8bae57f52f07fd2b1f51ba9e5dbdc756515d591262c157bbd24b013efe17dfda5f07509fb11dd06dcb4b5c15ea455f6b40fea49dfd0ab75

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
<maintainer>
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
</pkgmetadata>

@ -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/msgpack/msgpack-0.5.8.ebuild,v 1.2 2014/02/12 02:21:33 radhermit Exp $
EAPI="5"
AUTOTOOLS_AUTORECONF=1
inherit autotools-multilib
DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="static-libs test"
DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
DOCS=( AUTHORS ChangeLog README )
src_prepare() {
sed -i 's/-O3 //' configure.in || die
autotools-multilib_src_prepare
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.11.ebuild,v 1.1 2013/11/11 22:09:47 alonbl Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.11.ebuild,v 1.2 2014/02/11 18:44:47 jer Exp $
EAPI="5"
@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.bz2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="doc gnutls nss static-libs"
RDEPEND=">=dev-libs/openssl-0.9.7

@ -1,3 +1,2 @@
DIST serdisplib-1.97.5.tar.gz 206402 SHA256 83708ed0a16a37bd5f81da51e1353c9e59fa02024894bed20edfa73e8ca87ebf SHA512 4f7698bf550f36bc950f798ce5894ab7753fcfbca95c159523909746e9081910af7687fee9150aa50d9a3965d258a663109eacb55d1645ff3d172d58ae0b3062 WHIRLPOOL f6918ffb6f642ff099d5e833ad57c2232c8434e407740b0a3f7bec9fa443eeb28fd0bdaed29635c3b1239b187dbcaff42b3479d3da66c0b08e670ceb659f4687
DIST serdisplib-1.97.6.tar.gz 223238 SHA256 042b12382b6114876116ea202ff2b01fe759b6bdb2857834ec78048c123064c2 SHA512 380fb9bb3e643ab598d8b24acea0a7069bc0b65c0623eca3466d44ecb295a504cc3f5ba08157e70eb9331d9a0087bc41075b8aec07f62f6482b1d2c96ae36dde WHIRLPOOL 563b8a4272e295af0a76cbd269eb84f24fd4a9e3fb16eb5890b598b373bb645d07a16615e5942ca572d66f6c8a068322daf6bb327f98959d18287b4393153f18
DIST serdisplib-1.97.9.tar.gz 293190 SHA256 fe82ebe72731e91509083569dfe41a09e21632cc1211cdc4f76274f83ed218fa SHA512 ab45202fd1fd85b12f1ebf7a7e1a4575ad363f6faffd45949300840456e26dd521c70b67ff57c32e1ff6c0a9f2668b3be6a653afb57ba6da701fbae6e8db3118 WHIRLPOOL f5427445f07b48ce3b4aa00b4a8f5cfeaa5cfa2610b9c83e1c9eb712ac3d019e6027d599cdf2829bb23c9e8f9b670e43c14cea95b040f11e631f4071a4fc79aa

@ -1,42 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/serdisplib/serdisplib-1.97.5.ebuild,v 1.8 2012/05/25 08:28:21 ssuominen Exp $
EAPI=1
inherit eutils
DESCRIPTION="Library to drive serial/parallel/usb displays with built-in controllers"
HOMEPAGE="http://serdisplib.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE="usb"
DEPEND="media-libs/gd
usb? ( virtual/libusb:0 )"
RDEPEND="${DEPEND}"
pkg_setup() {
if ! built_with_use -a media-libs/gd jpeg png; then
echo
eerror "Please rebuild media-libs/gd with USE=\"jpeg png\"."
die "Please rebuild media-libs/gd with USE=\"jpeg png\"."
fi
}
src_compile() {
econf \
--prefix="${D}/usr" \
$(use_enable usb libusb) \
|| die "configure failed"
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
dodoc AUTHORS HISTORY README
}

@ -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-ml/core/core-109.60.00.ebuild,v 1.1 2014/01/19 15:59:08 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/core-109.60.00.ebuild,v 1.2 2014/02/12 11:32:23 aballier Exp $
EAPI="5"
@ -29,13 +29,10 @@ RDEPEND="
>=dev-ml/comparelib-109.27.00:=
>=dev-ml/herelib-109.35.00:=
>=dev-ml/pipebang-109.15.00:=
dev-ml/custom_printf:=
dev-ml/pa_bench:=
dev-ml/pa_test:=
"
DEPEND="${RDEPEND}
test? ( >=dev-ml/ounit-1.1.2 )"
DOCS=( "README.md" )
#src_prepare() {
# has_version '>=dev-lang/ocaml-4.01.0_beta' && epatch "${FILESDIR}/${PN}-ocaml-4.01.patch"
#}

@ -1 +1,2 @@
DIST re2-109.55.02.tar.gz 470378 SHA256 08f3370009575277b49b7d40af0fc5e4487e0b397e7cca3f7116119d7de43161 SHA512 8c7b85078da66bc6d9cfa01a63f3d876cea99ac7afb023f781cbc4f271e1a4a0169b8474023bec5e52a8975df3710d431a0aa99aea2f056e01bf8f2b20050d74 WHIRLPOOL 091c09e2660c435aafb445a4e548663c2c6691f46e99d80fb856e7ef967cf5b6cd7d7791b49a13c58fc18ffb4ae1aa53615c2e8bfca142a02ad4f7bdd02f0e46
DIST re2-109.55.04.tar.gz 470154 SHA256 5c41f42909833686e865deefcdf9c73da8dffdda342b16d700d7e762687694dd SHA512 7ff1dd90017c53fa514aada01802e145f20e674d738c4f236a01296bd7ebe331ed34d52f1e57e6b8ce6b1c172cb74e09ea2a0b4a2932f2b7aed97710da444b75 WHIRLPOOL e6b29b5a9ea358d6b0d369ec01205df7a329c69772429fee8994003c5299bd6f52aa879d1632a7eb538714521372f37eb9e52929a8e4a1129c12a72ba5265e62

@ -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-ml/re2/re2-109.55.04.ebuild,v 1.1 2014/02/12 11:53:22 aballier Exp $
EAPI="5"
OASIS_BUILD_DOCS=1
inherit oasis
MY_P=${PN/-/_}-${PV}
DESCRIPTION="OCaml bindings for RE2"
HOMEPAGE="http://www.janestreet.com/ocaml"
SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}.00/individual/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE=""
DEPEND=">=dev-ml/type-conv-${PV}:=
dev-ml/core:=
dev-ml/bin-prot:=
dev-ml/sexplib:=
dev-ml/comparelib:=
dev-libs/re2:="
RDEPEND="${DEPEND}"
DOCS=( "README.txt" )
S="${WORKDIR}/${MY_P}"

@ -1,3 +1,4 @@
DIST utop-1.10.tar.gz 99399 SHA256 929db54cb96ccddea33a5714e8d70c40f501e57c3910ef1f0048181100dada7c SHA512 19c405c29667184f4e40a2143b6963bc5fefb87a171b456e15ccc2f801b5d2850992f070c72824b6cb60ca76e75f047806bd543cc5be5690db53e997162857fc WHIRLPOOL 56e900515791e3e2a2666c75ad28ec9395ee0402ea4e0ef037511c0897857bd6d6007a748fda55750dd5bb23b3614ea8442aa868f06ad63e3be1b836816a6bfb
DIST utop-1.11.tar.gz 102730 SHA256 07dff727de3db9b9014f7ece3e94f044b50f9f0896e982c99efaa5199d4ccf2d SHA512 b26513f081e1ef6a139d74ca63b7d96a16d89a03d2dd42ccb4bc21463104184147c636bf26e44116fbba2330b8116ff9ee884fcc042fac89356f65ac2b133a92 WHIRLPOOL 4f0ca27eae1d2bc5a382d35b4bcfd4ad0ab581727df700047a9b71dc15a8b609ee5262911216456cea7f7e7b45a3f441fe80288a67e18283eb13e11d2f9a12b0
DIST utop-1.5.tar.gz 96814 SHA256 5a190c5c328df5f5705113063d093f73d01fd205bea20fcf8fda8db972bc8bd5 SHA512 2fd1c73f25a96853f03c53b36a4d3ad6550f9812db471781aaf27a27c0afa04669c6f82b521c37061d6467336bd9b5125365916d9e53bb60d81f34c3a77b11af WHIRLPOOL f3370fc90302768ab950ae6510399d7d34d6a46eb862f366b085cc646c6c898a0e65631b0e3dbbb95659d27f54adf19971cd621415f3949c1a29d1008b75b15c
DIST utop-1.8.tar.gz 98753 SHA256 658625fb5ffbb4df76c1e7622c5ce979a16b65fcc5c0958b3ed558d22ed7d08a SHA512 33b4abe7c74cdf29719f29b8692b53e1a076b3e53a947daa81034f0164ed08737e5e957d7c07a5c5c2b413250870929601fd5b35e52d93e85b65b11d464e8d39 WHIRLPOOL d441953065f75fc5eb867a889ac10e326363bf3c85dc9e9d837b5c996b336d4685a1c6d6d75331a636e416f35f28064653d2dc228d9e0ac1d56a7ac6b11f76f3

@ -0,0 +1,53 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ml/utop/utop-1.11.ebuild,v 1.1 2014/02/12 11:37:33 aballier Exp $
EAPI=5
OASIS_BUILD_DOCS=1
inherit oasis elisp-common
DESCRIPTION="A new toplevel for OCaml with completion and colorization"
HOMEPAGE="http://github.com/diml/utop"
SRC_URI="http://github.com/diml/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="emacs"
DEPEND=">=dev-ml/lwt-2.4.0:=[react]
>=dev-ml/lambda-term-1.2:=
>=dev-ml/zed-1.2:=
emacs? ( virtual/emacs )"
RDEPEND="${DEPEND}"
DOCS=( "CHANGES.md" "README.md" )
SITEFILE="50${PN}-gentoo.el"
src_prepare() {
sed -i "s/(\"utop.el.*)//" setup.ml
}
src_compile() {
oasis_src_compile
if use emacs; then
elisp-compile src/top/*.el
fi
}
src_install() {
oasis_src_install
if use emacs; then
elisp-install "${PN}" src/top/*.el src/top/*.elc || die
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
fi
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-Tiny/Config-Tiny-2.160.0.ebuild,v 1.1 2013/09/13 05:54:51 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-Tiny/Config-Tiny-2.160.0.ebuild,v 1.3 2014/02/11 18:49:33 jer Exp $
EAPI=5
@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="Read/Write .ini style files with as little code as possible"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
KEYWORDS="~alpha ~amd64 hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
SRC_TEST="do"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0.ebuild,v 1.1 2013/08/15 07:16:04 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0.ebuild,v 1.3 2014/02/11 18:50:36 jer Exp $
EAPI=4
@ -12,7 +12,7 @@ DESCRIPTION="Crypt::Blowfish module for perl"
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
SRC_TEST="do"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0.ebuild,v 1.1 2013/08/15 07:17:08 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0.ebuild,v 1.2 2014/02/11 15:15:42 hattya Exp $
EAPI=4
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="The Twofish Encryption Algorithm"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
KEYWORDS="~amd64 ia64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
SRC_TEST="do"

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-OptList/Data-OptList-0.108.0.ebuild,v 1.2 2014/02/01 23:50:41 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-OptList/Data-OptList-0.108.0.ebuild,v 1.3 2014/02/12 12:49:33 jer Exp $
EAPI=4
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="parse and validate simple name/value option pairs"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="dev-perl/Sub-Install

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.600.0.ebuild,v 1.3 2014/02/10 11:53:39 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.600.0.ebuild,v 1.4 2014/02/11 15:17:41 hattya Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Time zone object base class and factory"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="

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

Loading…
Cancel
Save