root
7 years ago
parent
8d27b7a8da
commit
6c3dbcec4f
@ -1,15 +0,0 @@
|
||||
gnulib/lib/stdio.in.h | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/gnulib/lib/stdio.in.h b/gnulib/lib/stdio.in.h
|
||||
index 9091497..fa7e3fb 100644
|
||||
--- a/gnulib/lib/stdio.in.h
|
||||
+++ b/gnulib/lib/stdio.in.h
|
||||
@@ -162,7 +162,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
|
||||
so any use of gets warrants an unconditional warning. Assume it is
|
||||
always declared, since it is required by C89. */
|
||||
#undef gets
|
||||
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||
|
||||
#if @GNULIB_FOPEN@
|
||||
# if @REPLACE_FOPEN@
|
||||
@ -1,24 +0,0 @@
|
||||
From b41deef293841da50a236023bad486ea3f57e4dc Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Sat, 3 Dec 2011 14:21:50 +0000
|
||||
Subject: [PATCH] pkg-config: Augeas requires libxml2.
|
||||
|
||||
---
|
||||
augeas.pc.in | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/augeas.pc.in b/augeas.pc.in
|
||||
index c97847d..9e166db 100644
|
||||
--- a/augeas.pc.in
|
||||
+++ b/augeas.pc.in
|
||||
@@ -6,6 +6,6 @@ includedir=@includedir@
|
||||
Name: augeas
|
||||
Version: @VERSION@
|
||||
Description: Augeas configuration editing library
|
||||
-Requires:
|
||||
+Requires.private: libxml-2.0
|
||||
Libs: -L${libdir} -laugeas @LIBS@
|
||||
Cflags: -I${includedir}
|
||||
--
|
||||
1.7.6
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From 075f8d35497fb36d9193e5364c055049c66fa5eb Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lubo.rintel@gooddata.com>
|
||||
Date: Mon, 9 Jan 2012 18:52:11 +0100
|
||||
Subject: [PATCH 1/2] Allow JSON number literals to be followed by whitespace
|
||||
|
||||
Add a test case.
|
||||
|
||||
Fixes https://fedorahosted.org/augeas/ticket/247
|
||||
---
|
||||
AUTHORS | 1 +
|
||||
lenses/json.aug | 2 +-
|
||||
lenses/tests/test_json.aug | 3 +++
|
||||
3 files changed, 5 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/AUTHORS b/AUTHORS
|
||||
index df63f95..e7870f2 100644
|
||||
--- a/AUTHORS
|
||||
+++ b/AUTHORS
|
||||
@@ -44,6 +44,7 @@ Contributions by:
|
||||
Bill Pemberton <wfp5p@virginia.edu>
|
||||
Alan Pevec <apevec@redhat.com>
|
||||
Robin Lee Powell <rlpowell@digitalkingdom.org>
|
||||
+ Lubomir Rintel <lubo.rintel@gooddata.com>
|
||||
Roman Rakus <rrakus@redhat.com>
|
||||
Satoru SATOH <satoru.satoh@gmail.com>
|
||||
Nicolas Valcárcel Scerpella <nvalcarcel@ubuntu.com>
|
||||
diff --git a/lenses/json.aug b/lenses/json.aug
|
||||
index c22ad90..6ceab09 100644
|
||||
--- a/lenses/json.aug
|
||||
+++ b/lenses/json.aug
|
||||
@@ -29,7 +29,7 @@ let str_store =
|
||||
let q = del "\"" "\"" in
|
||||
q . store /[^"]*/ . q . ws (* " Emacs, relax *)
|
||||
|
||||
-let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ ]
|
||||
+let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ . ws ]
|
||||
let str = [ label "string" . str_store ]
|
||||
|
||||
let const (r:regexp) = [ label "const" . store r . ws ]
|
||||
diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
|
||||
index 0bcd25d..d8b7fa8 100644
|
||||
--- a/lenses/tests/test_json.aug
|
||||
+++ b/lenses/tests/test_json.aug
|
||||
@@ -8,6 +8,9 @@ test lns get "true" = { "const" = "true" }
|
||||
|
||||
test lns get "3.141" = { "number" = "3.141" }
|
||||
|
||||
+test lns get "{ \"key\" : 666 }" =
|
||||
+ { "dict" { "entry" = "key" { "number" = "666" } } }
|
||||
+
|
||||
test lns get "[true, 0, \"yo\"]" =
|
||||
{ "array" { "const" = "true" } { "number" = "0" } { "string" = "yo" } }
|
||||
|
||||
--
|
||||
1.7.7.5
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From 100a7b38222a63c6435a72b4974b55f39a28989e Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lubo.rintel@gooddata.com>
|
||||
Date: Mon, 9 Jan 2012 19:24:41 +0100
|
||||
Subject: [PATCH 2/2] Correctly parse empty object and arrays in JSON
|
||||
|
||||
Add a test case.
|
||||
Fix from David Lutterkort <lutter@redhat.com>.
|
||||
|
||||
https://fedorahosted.org/augeas/ticket/248
|
||||
---
|
||||
lenses/json.aug | 4 ++--
|
||||
lenses/tests/test_json.aug | 5 +++++
|
||||
2 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lenses/json.aug b/lenses/json.aug
|
||||
index 6ceab09..2645806 100644
|
||||
--- a/lenses/json.aug
|
||||
+++ b/lenses/json.aug
|
||||
@@ -37,9 +37,9 @@ let const (r:regexp) = [ label "const" . store r . ws ]
|
||||
let value0 = str | number | const /true|false|null/
|
||||
|
||||
let fix_value (value:lens) =
|
||||
- let array = [ label "array" . lbrack . Build.opt_list value comma . rbrack ] in
|
||||
+ let array = [ label "array" . lbrack . (Build.opt_list value comma)? . rbrack ] in
|
||||
let pair = [ label "entry" . str_store . colon . value ] in
|
||||
- let obj = [ label "dict" . lbrace . Build.opt_list pair comma . rbrace ] in
|
||||
+ let obj = [ label "dict" . lbrace . (Build.opt_list pair comma)? . rbrace ] in
|
||||
(str | number | obj | array | const /true|false|null/)
|
||||
|
||||
(* Typecheck finitely deep nesting *)
|
||||
diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
|
||||
index d8b7fa8..aec7d4c 100644
|
||||
--- a/lenses/tests/test_json.aug
|
||||
+++ b/lenses/tests/test_json.aug
|
||||
@@ -30,6 +30,11 @@ test lns get "{ \"0\": true, \"1\":false }" =
|
||||
test lns get "{\"menu\": \"entry one\"}" =
|
||||
{ "dict" { "entry" = "menu" { "string" = "entry one" } } }
|
||||
|
||||
+test lns get "[ ]" =
|
||||
+ { "array" }
|
||||
+
|
||||
+test lns get "{}" =
|
||||
+ { "dict" }
|
||||
|
||||
let s = "{\"menu\": {
|
||||
\"id\": \"file\",
|
||||
--
|
||||
1.7.7.5
|
||||
|
||||
@ -1,159 +0,0 @@
|
||||
From 4cca923b732990bec0c699b2e69911c2221b2498 Mon Sep 17 00:00:00 2001
|
||||
From: David Lutterkort <lutter@watzmann.net>
|
||||
Date: Fri, 4 Aug 2017 17:13:52 -0700
|
||||
Subject: [PATCH] * src/pathx.c (parse_name): correctly handle trailing
|
||||
whitespace in names
|
||||
|
||||
When a name ended in whitespace, we incorrectly assumed it was always ok to
|
||||
trim that whitespace. That is not true if that whitespace is escaped,
|
||||
i.e. if the path expression is something like '/x\ '. In that case, the
|
||||
name really needs to be literally 'x ', i.e., we can not trim that
|
||||
whitespace.
|
||||
|
||||
The incorrect behavior led to turning '/x\ ' first into 'x\' and then,
|
||||
because we assume that '\' is always followed by a character inside the
|
||||
string, when we removed the escaping '\', we would read beyond the end of
|
||||
the intermediate string result; if we were lucky, that would lead to a
|
||||
crash, otherwise we'd continue with junk.
|
||||
|
||||
We now make sure that escaped whitespace at the end of a string does not
|
||||
get stripped, avoiding all these headaches.
|
||||
|
||||
Fixes RHBZ https://bugzilla.redhat.com/show_bug.cgi?id=1475621
|
||||
---
|
||||
src/pathx.c | 27 +++++++++++++++++++------
|
||||
tests/test-xpath.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 80 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/pathx.c b/src/pathx.c
|
||||
index d292cb30..9a2f9c76 100644
|
||||
--- a/src/pathx.c
|
||||
+++ b/src/pathx.c
|
||||
@@ -1710,6 +1710,16 @@ int pathx_escape_name(const char *in, char **out) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
+/* Return true if POS is preceded by an odd number of backslashes, i.e., if
|
||||
+ * POS is escaped. Stop the search when we get to START */
|
||||
+static bool backslash_escaped(const char *pos, const char *start) {
|
||||
+ bool result=false;
|
||||
+ while (pos-- > start && *pos == '\\') {
|
||||
+ result = !result;
|
||||
+ }
|
||||
+ return result;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* NameNoWS ::= [^][|/\= \t\n] | \\.
|
||||
* NameWS ::= [^][|/\=] | \\.
|
||||
@@ -1719,11 +1729,14 @@ static char *parse_name(struct state *state) {
|
||||
const char *s = state->pos;
|
||||
char *result;
|
||||
|
||||
+ /* Advance state->pos until it points to the first character that is
|
||||
+ * not part of a name. */
|
||||
while (*state->pos != '\0' && strchr(name_follow, *state->pos) == NULL) {
|
||||
- /* This is a hack: since we allow spaces in names, we need to avoid
|
||||
- * gobbling up stuff that is in follow(Name), e.g. 'or' so that
|
||||
- * things like [name1 or name2] still work.
|
||||
- */
|
||||
+ /* Since we allow spaces in names, we need to avoid gobbling up
|
||||
+ * stuff that is in follow(Name), e.g. 'or' so that things like
|
||||
+ * [name1 or name2] still work. In other words, we'll parse 'x frob
|
||||
+ * y' as one name, but for 'x or y', we consider 'x' a name in its
|
||||
+ * own right. */
|
||||
if (STREQLEN(state->pos, " or ", strlen(" or ")) ||
|
||||
STREQLEN(state->pos, " and ", strlen(" and ")))
|
||||
break;
|
||||
@@ -1738,10 +1751,12 @@ static char *parse_name(struct state *state) {
|
||||
state->pos += 1;
|
||||
}
|
||||
|
||||
- /* Strip trailing white space */
|
||||
+ /* Strip trailing white space. Make sure we respect escaped whitespace
|
||||
+ * and don't strip it as in "x\\ " */
|
||||
if (state->pos > s) {
|
||||
state->pos -= 1;
|
||||
- while (isspace(*state->pos) && state->pos >= s)
|
||||
+ while (isspace(*state->pos) && state->pos > s
|
||||
+ && !backslash_escaped(state->pos, s))
|
||||
state->pos -= 1;
|
||||
state->pos += 1;
|
||||
}
|
||||
diff --git a/tests/test-xpath.c b/tests/test-xpath.c
|
||||
index 3e418e5f..82986474 100644
|
||||
--- a/tests/test-xpath.c
|
||||
+++ b/tests/test-xpath.c
|
||||
@@ -355,6 +355,62 @@ static int test_wrong_regexp_flag(struct augeas *aug) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
+static int test_trailing_ws_in_name(struct augeas *aug) {
|
||||
+ int r;
|
||||
+
|
||||
+ printf("%-30s ... ", "trailing_ws_in_name");
|
||||
+
|
||||
+ /* We used to incorrectly lop escaped whitespace off the end of a
|
||||
+ * name. Make sure that we really create a tree node with label 'x '
|
||||
+ * with the below set, and look for it in a number of ways to ensure we
|
||||
+ * are not lopping off trailing whitespace. */
|
||||
+ r = aug_set(aug, "/ws\\ ", "1");
|
||||
+ if (r < 0) {
|
||||
+ fprintf(stderr, "failed to set '/ws ': %d\n", r);
|
||||
+ goto fail;
|
||||
+ }
|
||||
+ /* We did not create a node with label 'ws' */
|
||||
+ r = aug_get(aug, "/ws", NULL);
|
||||
+ if (r != 0) {
|
||||
+ fprintf(stderr, "created '/ws' instead: %d\n", r);
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
+ /* We did not create a node with label 'ws\t' (this also checks that we
|
||||
+ * don't create something like 'ws\\' by dropping the last whitespace
|
||||
+ * character. */
|
||||
+ r = aug_get(aug, "/ws\\\t", NULL);
|
||||
+ if (r != 0) {
|
||||
+ fprintf(stderr, "found '/ws\\t': %d\n", r);
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
+ /* But we did create 'ws ' */
|
||||
+ r = aug_get(aug, "/ws\\ ", NULL);
|
||||
+ if (r != 1) {
|
||||
+ fprintf(stderr, "could not find '/ws ': %d\n", r);
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
+ /* If the whitespace is preceded by an even number of '\\' chars,
|
||||
+ * whitespace must be stripped */
|
||||
+ r = aug_set(aug, "/nows\\\\ ", "1");
|
||||
+ if (r < 0) {
|
||||
+ fprintf(stderr, "set of '/nows' failed: %d\n", r);
|
||||
+ goto fail;
|
||||
+ }
|
||||
+ r = aug_get(aug, "/nows\\\\", NULL);
|
||||
+ if (r != 1) {
|
||||
+ fprintf(stderr, "could not get '/nows\\'\n");
|
||||
+ goto fail;
|
||||
+ }
|
||||
+ printf("PASS\n");
|
||||
+ return 0;
|
||||
+ fail:
|
||||
+ printf("FAIL\n");
|
||||
+ return -1;
|
||||
+}
|
||||
+
|
||||
static int run_tests(struct test *tests, int argc, char **argv) {
|
||||
char *lensdir;
|
||||
struct augeas *aug = NULL;
|
||||
@@ -398,6 +454,9 @@ static int run_tests(struct test *tests, int argc, char **argv) {
|
||||
|
||||
if (test_wrong_regexp_flag(aug) < 0)
|
||||
result = EXIT_FAILURE;
|
||||
+
|
||||
+ if (test_trailing_ws_in_name(aug) < 0)
|
||||
+ result = EXIT_FAILURE;
|
||||
}
|
||||
aug_close(aug);
|
||||
free(lensdir);
|
||||
@ -1,76 +0,0 @@
|
||||
From 051c73a9a7ffe9e525f6f0a1b8f5198ff8cc6752 Mon Sep 17 00:00:00 2001
|
||||
From: Dominic Cleal <dcleal@redhat.com>
|
||||
Date: Sat, 11 Aug 2012 20:39:14 +0100
|
||||
Subject: [PATCH] Fix regression in permissions of created files
|
||||
|
||||
Commit 16387744 changed temporary file creation to use mkstemp, resulting in
|
||||
new files being created with 0600 permissions. For brand new files created
|
||||
through Augeas, their permissions stayed at 0600 rather than being set by the
|
||||
umask as before.
|
||||
|
||||
* src/transform.c (transform_save): chmod after creating new files to
|
||||
permissions implied by the umask
|
||||
---
|
||||
src/transform.c | 10 ++++++++++
|
||||
tests/test-preserve.sh | 15 ++++++++++++++-
|
||||
2 files changed, 24 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/transform.c b/src/transform.c
|
||||
index a3acd10..1ca3d5f 100644
|
||||
--- a/src/transform.c
|
||||
+++ b/src/transform.c
|
||||
@@ -1096,6 +1096,16 @@ int transform_save(struct augeas *aug, struct tree *xfm,
|
||||
err_status = "xfer_attrs";
|
||||
goto done;
|
||||
}
|
||||
+ } else {
|
||||
+ /* Since mkstemp is used, the temp file will have secure permissions
|
||||
+ * instead of those implied by umask, so change them for new files */
|
||||
+ mode_t curumsk = umask(022);
|
||||
+ umask(curumsk);
|
||||
+
|
||||
+ if (fchmod(fileno(fp), 0666 - curumsk) < 0) {
|
||||
+ err_status = "create_chmod";
|
||||
+ return -1;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (tree != NULL)
|
||||
diff --git a/tests/test-preserve.sh b/tests/test-preserve.sh
|
||||
index 042dab9..9719ac6 100755
|
||||
--- a/tests/test-preserve.sh
|
||||
+++ b/tests/test-preserve.sh
|
||||
@@ -59,9 +59,12 @@ if [ $selinux = yes -a xetc_t != "x$act_con" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-# Check that we create new files without error
|
||||
+# Check that we create new files without error and with permissions implied
|
||||
+# from the umask
|
||||
init_dirs
|
||||
|
||||
+oldumask=$(umask)
|
||||
+umask 0002
|
||||
$AUGTOOL > /dev/null <<EOF
|
||||
set /files/etc/hosts/1/ipaddr 127.0.0.1
|
||||
set /files/etc/hosts/1/canonical host.example.com
|
||||
@@ -71,6 +74,16 @@ if [ $? != 0 ] ; then
|
||||
echo "augtool failed on new file"
|
||||
exit 1
|
||||
fi
|
||||
+if [ ! -e $hosts ]; then
|
||||
+ echo "augtool didn't create new /etc/hosts file"
|
||||
+ exit 1
|
||||
+fi
|
||||
+act_mode=$(ls -l $hosts | cut -b 1-10)
|
||||
+if [ x-rw-rw-r-- != "x$act_mode" ] ; then
|
||||
+ echo "Expected mode 0664 due to $(umask) umask but got $act_mode"
|
||||
+ exit 1
|
||||
+fi
|
||||
+umask $oldumask
|
||||
|
||||
# Check that we create new files without error when backups are requested
|
||||
init_dirs
|
||||
--
|
||||
1.8.5.1
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools db-use eutils flag-o-matic
|
||||
|
||||
DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
|
||||
DBSLOTS=
|
||||
DBDEPENDS=
|
||||
for DBVER in ${DBVERS}
|
||||
do
|
||||
if [[ ${DBVER} = *.*.* ]]; then
|
||||
DBSLOTS="${DBSLOTS} ${DBVER%.*}"
|
||||
DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}"
|
||||
else
|
||||
DBSLOTS="${DBSLOTS} ${DBVER}"
|
||||
DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}"
|
||||
fi
|
||||
done
|
||||
|
||||
DESCRIPTION="Vi clone"
|
||||
HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
|
||||
SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
|
||||
IUSE="perl tcl unicode"
|
||||
|
||||
CDEPEND="|| ( ${DBDEPENDS} )
|
||||
>=sys-libs/ncurses-5.6-r2
|
||||
perl? ( dev-lang/perl )
|
||||
tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
app-eselect/eselect-vi"
|
||||
|
||||
REQUIRED_USE="tcl? ( !unicode )"
|
||||
|
||||
src_prepare() {
|
||||
|
||||
epatch "${FILESDIR}"/${P}-db44.patch
|
||||
epatch "${FILESDIR}"/${P}-db.patch
|
||||
epatch "${FILESDIR}"/${P}-perl-as-needed.patch
|
||||
epatch "${FILESDIR}"/${P}-perl-shortnames.patch
|
||||
epatch "${FILESDIR}"/${P}-ac_config_header.patch
|
||||
epatch "${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
|
||||
|
||||
cd dist || die
|
||||
chmod +x findconfig || die
|
||||
|
||||
append-cppflags -I"$(db_includedir ${DBSLOTS})"
|
||||
|
||||
sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.in || die
|
||||
rm -f configure || die
|
||||
eautoreconf -Im4
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
use perl && myconf="${myconf} --enable-perlinterp"
|
||||
use unicode && myconf="${myconf} --enable-widechar"
|
||||
use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
|
||||
|
||||
append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'
|
||||
|
||||
pushd dist 2>/dev/null
|
||||
econf \
|
||||
--program-prefix=n \
|
||||
${myconf} \
|
||||
|| die "configure failed"
|
||||
popd 2>/dev/null
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pushd dist 2>/dev/null
|
||||
emake || die "make failed"
|
||||
popd 2>/dev/null
|
||||
}
|
||||
|
||||
src_install() {
|
||||
pushd dist 2>/dev/null
|
||||
emake -j1 DESTDIR="${D}" install || die "install failed"
|
||||
popd 2>/dev/null
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Setting /usr/bin/vi symlink"
|
||||
eselect vi update --if-unset
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
einfo "Updating /usr/bin/vi symlink"
|
||||
eselect vi update --if-unset
|
||||
}
|
||||
@ -1,100 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools db-use flag-o-matic
|
||||
|
||||
DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
|
||||
DBSLOTS=
|
||||
DBDEPENDS=
|
||||
for DBVER in ${DBVERS}
|
||||
do
|
||||
if [[ ${DBVER} = *.*.* ]]; then
|
||||
DBSLOTS="${DBSLOTS} ${DBVER%.*}"
|
||||
DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}"
|
||||
else
|
||||
DBSLOTS="${DBSLOTS} ${DBVER}"
|
||||
DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}"
|
||||
fi
|
||||
done
|
||||
|
||||
DESCRIPTION="Vi clone"
|
||||
HOMEPAGE="https://sites.google.com/a/bostic.com/keithbostic/vi"
|
||||
SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="perl tcl unicode"
|
||||
|
||||
CDEPEND="|| ( ${DBDEPENDS} )
|
||||
>=sys-libs/ncurses-5.6-r2:=
|
||||
perl? ( dev-lang/perl )
|
||||
tcl? ( !unicode? ( >=dev-lang/tcl-8.5:0 ) )"
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
app-eselect/eselect-vi"
|
||||
|
||||
REQUIRED_USE="tcl? ( !unicode )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-strlen-macro-renaming.patch
|
||||
"${FILESDIR}"/${P}-db44.patch
|
||||
"${FILESDIR}"/${P}-db.patch
|
||||
"${FILESDIR}"/${P}-perl-as-needed.patch
|
||||
"${FILESDIR}"/${P}-perl-shortnames.patch
|
||||
"${FILESDIR}"/${P}-ac_config_header.patch
|
||||
"${FILESDIR}"/${P}-use_pkgconfig_for_ncurses.patch
|
||||
"${FILESDIR}"/${P}-printf-types.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
cd dist || die
|
||||
chmod +x findconfig || die
|
||||
|
||||
mv configure.{in,ac} || die
|
||||
sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.ac || die
|
||||
sed -i -e "s@^install-\(.*\)-local:@install-\1-hook:@" Makefile.am || die
|
||||
eautoreconf -Im4
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
use perl && myconf="${myconf} --enable-perlinterp"
|
||||
use unicode && myconf="${myconf} --enable-widechar"
|
||||
use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
|
||||
|
||||
append-cppflags '-D_PATH_MSGCAT="\"/usr/share/vi/catalog/\""'
|
||||
append-cppflags -I"$(db_includedir ${DBSLOTS})"
|
||||
|
||||
pushd dist 2>/dev/null || die
|
||||
econf \
|
||||
--program-prefix=n \
|
||||
${myconf}
|
||||
popd 2>/dev/null || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C dist
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -C dist DESTDIR="${D}" install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Setting /usr/bin/vi symlink"
|
||||
eselect vi update --if-unset
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
einfo "Updating /usr/bin/vi symlink"
|
||||
eselect vi update --if-unset
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
|
||||
DIST elasticsearch-5.6.2.tar.gz 33766495 SHA256 ef505373fdd85c762dedef0b067ce7b089e177568a57b31e5b4126d8acd47653 SHA512 a20cd6607cc9fd94b37c8592b2aaaede4136349d66175581ccba999bc5a64038387680f471fca600afc2b538e4aecbb9d3ee1f82aa327853d072feff2f950319 WHIRLPOOL 322999b483f7cd84716efb329542ea59228e93cc0a1ef86d5612230a0637ecff44063e488f48e673ffadda0cbcba026374bb2251de6cc8f6a8ce2699399864a2
|
||||
DIST elasticsearch-5.6.3.tar.gz 33774486 SHA256 492b7e59d5204b3dc7eb13b611c33b3db36b392bdd6a4c004ba99c6543fc28f9 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e WHIRLPOOL bda081e6b91d1076a39e0af75b44d7f877f28178281de1f22c5177abf804c9395dacabb3c93ec93aff65223df42353bc955bbf60e74fb07f99320096dd97173a
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
Ripped from Fedora
|
||||
|
||||
- Fixed AFS support for output redirection, so that the correct errors
|
||||
are reported for other filesystems (bug #155373).
|
||||
|
||||
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155373
|
||||
|
||||
--- bash-3.0/redir.c.afs 2005-04-20 09:16:15.000000000 +0100
|
||||
+++ bash-3.0/redir.c 2005-04-20 09:16:58.000000000 +0100
|
||||
@@ -596,7 +596,9 @@
|
||||
fd = open (filename, flags, mode);
|
||||
#if defined (AFS)
|
||||
if ((fd < 0) && (errno == EACCES))
|
||||
- fd = open (filename, flags & ~O_CREAT, mode);
|
||||
+ if ((fd = open (filename, flags & ~O_CREAT, mode)) < 0)
|
||||
+ /* Restore previous errno. */
|
||||
+ errno = EACCES;
|
||||
#endif /* AFS */
|
||||
}
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
> Machine Type: i686-pc-linux-gnu
|
||||
>
|
||||
> Bash Version: 3.0
|
||||
> Patch Level: 0
|
||||
> Release Status: release
|
||||
>
|
||||
> Description:
|
||||
> GNU bash, version 3.00.0(1)-release (i686-pc-linux-gnu)
|
||||
> (and
|
||||
> GNU bash, version 2.05b.0(1)-release (i386-redhat-linux-gnu)
|
||||
>
|
||||
> dumps a core because of a null pointer "in make_bare_word
|
||||
> at make_cmd.c:90" (see gdb output below)
|
||||
|
||||
Thanks for the report. Here's a quick fix:
|
||||
|
||||
*** arrayfunc.c~ Sat Nov 6 15:08:29 2004
|
||||
--- arrayfunc.c Mon Jan 31 11:56:21 2005
|
||||
***************
|
||||
*** 709,713 ****
|
||||
return ((char *)NULL);
|
||||
}
|
||||
! else if (var == 0)
|
||||
return ((char *)NULL);
|
||||
else if (array_p (var) == 0)
|
||||
--- 709,713 ----
|
||||
return ((char *)NULL);
|
||||
}
|
||||
! else if (var == 0 || value_cell (var) == 0)
|
||||
return ((char *)NULL);
|
||||
else if (array_p (var) == 0)
|
||||
|
||||
|
||||
Chet
|
||||
|
||||
--
|
||||
``The lyf so short, the craft so long to lerne.'' - Chaucer
|
||||
( ``Discere est Dolere'' -- chet )
|
||||
Live...Laugh...Love
|
||||
Chet Ramey, ITS, CWRU chet@po.cwru.edu http://tiswww.tis.cwru.edu/~chet/
|
||||
|
||||
|
||||
_______________________________________________
|
||||
Bug-bash mailing list
|
||||
Bug-bash@gnu.org
|
||||
http://lists.gnu.org/mailman/listinfo/bug-bash
|
||||
@ -1,56 +0,0 @@
|
||||
Ripped from Debian
|
||||
|
||||
http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00008.html
|
||||
|
||||
From: Enrique Perez-Terron <enrio@online.no>
|
||||
To: bug-bash@gnu.org
|
||||
Subject: When using HISTTIMEFORMAT, the date and the command are run
|
||||
together.
|
||||
Date: Sun, 01 Aug 2004 18:36:45 +0200
|
||||
|
||||
Configuration Information [Automatically generated, do not change]:
|
||||
Machine: i586
|
||||
OS: linux-gnu
|
||||
Compiler: gcc
|
||||
Compilation CFLAGS: -DPROGRAM='bash' -DCONF_HOSTTYPE='i586'
|
||||
-DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='i586-pc-linux-gnu'
|
||||
-DCONF_VENDOR='pc' -DLOCALEDIR='/usr/local/share/locale'
|
||||
-DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H -I. -I. -I./include -I./lib
|
||||
-g -O2
|
||||
uname output: Linux arabia.home.lan 2.6.6-1.435.2.3 #1 Thu Jul 1
|
||||
09:11:28 EDT 2004 i586 i586 i386 GNU/Linux
|
||||
Machine Type: i586-pc-linux-gnu
|
||||
|
||||
# DP: Add space separating the time and the command in the
|
||||
# DP: output from the history builtin command.
|
||||
|
||||
Bash Version: 3.0
|
||||
Patch Level: 0
|
||||
Release Status: release
|
||||
|
||||
Description:
|
||||
There is no space separating the time and the command in the
|
||||
output from the history builtin command.
|
||||
|
||||
Repeat-By:
|
||||
$ export HISTTIMEFORMAT=_A_format_string_
|
||||
$ history 3
|
||||
997 _A_format_string_echo $BASH_VERSION
|
||||
998 _A_format_string_export HISTTIMEFORMAT=_A_format_string_
|
||||
999 _A_format_string_history 3
|
||||
|
||||
Fix:
|
||||
--- ./builtins/history.def.orig 2003-12-20 00:02:09.000000000 +0100
|
||||
+++ ./builtins/history.def 2004-08-01 18:18:02.652720102 +0200
|
||||
@@ -287,9 +287,10 @@
|
||||
QUIT;
|
||||
|
||||
timestr = (histtimefmt && *histtimefmt) ? histtime (hlist[i], histtimefmt) : (char *)NULL;
|
||||
- printf ("%5d%c %s%s\n", i + history_base,
|
||||
+ printf ("%5d%c %s%s%s\n", i + history_base,
|
||||
histdata(i) ? '*' : ' ',
|
||||
((timestr && *timestr) ? timestr : ""),
|
||||
+ ((timestr && *timestr) ? " " : ""),
|
||||
histline(i));
|
||||
i++;
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
Ripped from Fedora
|
||||
|
||||
* Wed Sep 8 2004 Tim Waugh <twaugh@redhat.com> 3.0-13
|
||||
- Check for EINVAL from waitpid() and avoid WCONTINUED in that case.
|
||||
- Fixed jobs4 test.
|
||||
|
||||
From: Tim Waugh
|
||||
Subject: [patch] bash-3.0: avoid WCONTINUED if invalid
|
||||
Date: Wed, 8 Sep 2004 16:52:38 +0100
|
||||
User-agent: Mutt/1.4.1i
|
||||
|
||||
Hi,
|
||||
|
||||
GNU libc defines WCONTINUED, but (at least on Linux 2.4.x kernels)
|
||||
waitpid() returns -1 with errno set to EINVAL if WCONTINUED is
|
||||
supplied in options.
|
||||
|
||||
Here is a patch to retry without WCONTINUED set in that case.
|
||||
|
||||
Tim.
|
||||
|
||||
--- bash-3.0/tests/jobs4.sub
|
||||
+++ bash-3.0/tests/jobs4.sub
|
||||
@@ -18,5 +18,5 @@
|
||||
|
||||
wait
|
||||
|
||||
-cat &
|
||||
+sleep 100 &
|
||||
kill -1 %% && echo i killed it || echo could not kill it
|
||||
--- bash-3.0/jobs.c
|
||||
+++ bash-3.0/jobs.c
|
||||
@@ -2475,6 +2475,7 @@
|
||||
PROCESS *child;
|
||||
pid_t pid;
|
||||
int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
|
||||
+ static int wcontinued_not_supported = 0;
|
||||
|
||||
call_set_current = children_exited = 0;
|
||||
last_stopped_job = NO_JOB;
|
||||
@@ -2488,7 +2489,15 @@
|
||||
: 0;
|
||||
if (sigchld || block == 0)
|
||||
waitpid_flags |= WNOHANG;
|
||||
+ retry:
|
||||
+ if (wcontinued_not_supported)
|
||||
+ waitpid_flags &= ~WCONTINUED;
|
||||
pid = WAITPID (-1, &status, waitpid_flags);
|
||||
+ if (pid == -1 && errno == EINVAL)
|
||||
+ {
|
||||
+ wcontinued_not_supported = 1;
|
||||
+ goto retry;
|
||||
+ }
|
||||
|
||||
/* The check for WNOHANG is to make sure we decrement sigchld only
|
||||
if it was non-zero before we called waitpid. */
|
||||
@ -1,112 +0,0 @@
|
||||
Ripped from SuSe
|
||||
|
||||
http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00005.html
|
||||
|
||||
From: schwab@suse.de
|
||||
To: bug-bash@gnu.org
|
||||
Subject: HISTTIMEFORMAT doesn't track locale changes
|
||||
Date: Sun, 1 Aug 2004 11:14:00 +0200 (CEST)
|
||||
|
||||
Configuration Information [Automatically generated, do not change]:
|
||||
Machine: ia64
|
||||
OS: linux-gnu
|
||||
Compiler: gcc
|
||||
Compilation CFLAGS: -DPROGRAM='bash' -DCONF_HOSTTYPE='ia64' -DCONF_OSTYPE='linux-gnu' -DCONF_MACHTYPE='ia64-unknown-linux-gnu' -DCONF_VENDOR='unknown' -DLOCALEDIR='/usr/local/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H -I. -I../bash-3.0 -I../bash-3.0/include -I../bash-3.0/lib -O2 -g
|
||||
uname output: Linux sykes 2.6.5-22-default #1 SMP Fri Jul 2 13:43:23 UTC 2004 ia64 ia64 ia64 GNU/Linux
|
||||
Machine Type: ia64-unknown-linux-gnu
|
||||
|
||||
Bash Version: 3.0
|
||||
Patch Level: 0
|
||||
Release Status: release
|
||||
|
||||
Description:
|
||||
Bash doesn't use the current locale when formatting HISTTIMEFORMAT.
|
||||
|
||||
Repeat-By:
|
||||
sykes:/tmp/bash/Build/:[0]$ locale
|
||||
LANG=de_DE.UTF-8
|
||||
LC_CTYPE="de_DE.UTF-8"
|
||||
LC_NUMERIC=POSIX
|
||||
LC_TIME=POSIX
|
||||
LC_COLLATE=POSIX
|
||||
LC_MONETARY="de_DE.UTF-8"
|
||||
LC_MESSAGES=en_US.UTF-8
|
||||
LC_PAPER="de_DE.UTF-8"
|
||||
LC_NAME="de_DE.UTF-8"
|
||||
LC_ADDRESS="de_DE.UTF-8"
|
||||
LC_TELEPHONE="de_DE.UTF-8"
|
||||
LC_MEASUREMENT="de_DE.UTF-8"
|
||||
LC_IDENTIFICATION="de_DE.UTF-8"
|
||||
LC_ALL=
|
||||
sykes:/tmp/bash/Build/:[0]$ history 1
|
||||
1502 history 1
|
||||
sykes:/tmp/bash/Build/:[0]$ HISTTIMEFORMAT=%c
|
||||
sykes:/tmp/bash/Build/:[0]$ history 1
|
||||
1504 Sun Aug 1 10:56:59 2004history 1
|
||||
sykes:/tmp/bash/Build/:[0]$ export LC_TIME=$LANG
|
||||
sykes:/tmp/bash/Build/:[0]$ history 1
|
||||
1506 Sun Aug 1 10:57:24 2004history 1
|
||||
|
||||
--- bash-3.0/locale.c
|
||||
+++ bash-3.0/locale.c
|
||||
@@ -71,9 +71,10 @@ set_default_locale ()
|
||||
textdomain (PACKAGE);
|
||||
}
|
||||
|
||||
-/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES and LC_NUMERIC
|
||||
- if they are not specified in the environment, but LC_ALL is. This
|
||||
- should be called from main() after parsing the environment. */
|
||||
+/* Set default values for LC_CTYPE, LC_COLLATE, LC_MESSAGES, LC_NUMERIC
|
||||
+ and LC_TIME if they are not specified in the environment, but LC_ALL
|
||||
+ is. This should be called from main() after parsing the
|
||||
+ environment. */
|
||||
void
|
||||
set_default_locale_vars ()
|
||||
{
|
||||
@@ -109,6 +110,12 @@ set_default_locale_vars ()
|
||||
setlocale (LC_NUMERIC, lc_all);
|
||||
# endif /* LC_NUMERIC */
|
||||
|
||||
+# if defined (LC_TIME)
|
||||
+ val = get_string_value ("LC_TIME");
|
||||
+ if (val == 0 && lc_all && *lc_all)
|
||||
+ setlocale (LC_TIME, lc_all);
|
||||
+# endif /* LC_TIME */
|
||||
+
|
||||
#endif /* HAVE_SETLOCALE */
|
||||
|
||||
val = get_string_value ("TEXTDOMAIN");
|
||||
@@ -213,6 +220,13 @@ set_locale_var (var, value)
|
||||
return (setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC")) != 0);
|
||||
# endif /* LC_NUMERIC */
|
||||
}
|
||||
+ else if (var[3] == 'T' && var[4] == 'I') /* LC_TIME */
|
||||
+ {
|
||||
+# if defined (LC_TIME)
|
||||
+ if (lc_all == 0 || *lc_all == '\0')
|
||||
+ return (setlocale (LC_TIME, get_locale_var ("LC_TIME")) != 0);
|
||||
+# endif /* LC_TIME */
|
||||
+ }
|
||||
#endif /* HAVE_SETLOCALE */
|
||||
|
||||
return (0);
|
||||
@@ -285,6 +299,9 @@ reset_locale_vars ()
|
||||
# if defined (LC_NUMERIC)
|
||||
setlocale (LC_NUMERIC, get_locale_var ("LC_NUMERIC"));
|
||||
# endif
|
||||
+# if defined (LC_TIME)
|
||||
+ setlocale (LC_TIME, get_locale_var ("LC_TIME"));
|
||||
+# endif
|
||||
|
||||
locale_setblanks ();
|
||||
|
||||
--- bash-3.0/variables.c
|
||||
+++ bash-3.0/variables.c
|
||||
@@ -3646,6 +3646,7 @@ static struct name_and_function special_
|
||||
{ "LC_CTYPE", sv_locale },
|
||||
{ "LC_MESSAGES", sv_locale },
|
||||
{ "LC_NUMERIC", sv_locale },
|
||||
+ { "LC_TIME", sv_locale },
|
||||
|
||||
{ "MAIL", sv_mail },
|
||||
{ "MAILCHECK", sv_mail },
|
||||
@ -1,15 +0,0 @@
|
||||
Ripped from Fedora
|
||||
|
||||
fix obvious display bug
|
||||
|
||||
--- bash-3.0/doc/bash.1
|
||||
+++ bash-3.0/doc/bash.1
|
||||
@@ -3929,7 +3929,7 @@
|
||||
.B SIGHUP
|
||||
to all jobs when an interactive login shell exits.
|
||||
.PP
|
||||
-If \Bbash\fP is waiting for a command to complete and receives a signal
|
||||
+If \fBbash\fP is waiting for a command to complete and receives a signal
|
||||
for which a trap has been set, the trap will not be executed until
|
||||
the command completes.
|
||||
When \fBbash\fP is waiting for an asynchronous command via the \fBwait\fP
|
||||
@ -1,281 +0,0 @@
|
||||
From: Tim Waugh <twaugh@redhat.com>
|
||||
To: bug-bash@gnu.org
|
||||
Subject: [patch] multibyte IFS values
|
||||
Date: Tue, 24 Aug 2004 13:34:59 +0100
|
||||
|
||||
Hi,
|
||||
|
||||
Here is a patch to address these problems:
|
||||
|
||||
http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00294.html
|
||||
http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00296.html
|
||||
|
||||
It works well for me at least.
|
||||
|
||||
Tim.
|
||||
|
||||
--- bash-3.0/subst.c.multibyteifs 2004-08-20 15:22:48.366497771 +0100
|
||||
+++ bash-3.0/subst.c 2004-08-20 18:13:30.833624616 +0100
|
||||
@@ -124,7 +124,12 @@
|
||||
SHELL_VAR *ifs_var;
|
||||
char *ifs_value;
|
||||
unsigned char ifs_cmap[UCHAR_MAX + 1];
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+unsigned char ifs_firstc[MB_LEN_MAX];
|
||||
+size_t ifs_firstc_len;
|
||||
+#else
|
||||
unsigned char ifs_firstc;
|
||||
+#endif
|
||||
|
||||
/* Extern functions and variables from different files. */
|
||||
extern int last_command_exit_value, last_command_exit_signal;
|
||||
@@ -862,8 +867,14 @@
|
||||
char *charlist;
|
||||
{
|
||||
register int i = *sindex;
|
||||
+ size_t slen;
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ size_t clen;
|
||||
+ wchar_t *wcharlist = NULL;
|
||||
+#endif
|
||||
int c;
|
||||
char *temp;
|
||||
+ DECLARE_MBSTATE;
|
||||
|
||||
if (charlist[0] == '\'' && charlist[1] == '\0')
|
||||
{
|
||||
@@ -872,18 +883,65 @@
|
||||
return temp;
|
||||
}
|
||||
|
||||
- for (i = *sindex; c = string[i]; i++)
|
||||
+ slen = strlen (string + *sindex) + *sindex;
|
||||
+ i = *sindex;
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ clen = strlen (charlist);
|
||||
+#endif
|
||||
+ while ((c = string[i]))
|
||||
{
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ size_t mblength;
|
||||
+#endif
|
||||
+
|
||||
if (c == CTLESC)
|
||||
{
|
||||
- i++;
|
||||
+ i += 2;
|
||||
continue;
|
||||
}
|
||||
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ mblength = mblen (string + i, slen - i);
|
||||
+ if (mblength > 1)
|
||||
+ {
|
||||
+ wchar_t wc;
|
||||
+ size_t mblength = mbtowc (&wc, string + i, slen - i);
|
||||
+ if (MB_INVALIDCH (mblength))
|
||||
+ {
|
||||
+ if (MEMBER (c, charlist))
|
||||
+ break;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ if (!wcharlist)
|
||||
+ {
|
||||
+ size_t len = mbstowcs (wcharlist, charlist, 0);
|
||||
+ if (len == -1)
|
||||
+ len = 0;
|
||||
+ wcharlist = xmalloc (sizeof (wchar_t) * (len + 1));
|
||||
+ mbstowcs (wcharlist, charlist, 1 + len);
|
||||
+ }
|
||||
+
|
||||
+ if (wcschr (wcharlist, wc))
|
||||
+ {
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+#endif
|
||||
+
|
||||
if (MEMBER (c, charlist))
|
||||
break;
|
||||
+
|
||||
+ ADVANCE_CHAR (string, slen, i);
|
||||
}
|
||||
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ if (wcharlist)
|
||||
+ free (wcharlist);
|
||||
+#endif
|
||||
+
|
||||
temp = substring (string, *sindex, i);
|
||||
*sindex = i;
|
||||
|
||||
@@ -1456,11 +1514,36 @@
|
||||
d2 = 0;
|
||||
if (delims)
|
||||
{
|
||||
- d2 = (char *)xmalloc (strlen (delims) + 1);
|
||||
- for (i = ts = 0; delims[i]; i++)
|
||||
+ size_t slength = strlen (delims);
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ size_t mblength = 1;
|
||||
+ DECLARE_MBSTATE;
|
||||
+#endif
|
||||
+
|
||||
+ d2 = (char *)xmalloc (slength + 1);
|
||||
+ i = ts = 0;
|
||||
+ while (delims[i])
|
||||
{
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ mbstate_t state_bak = state;
|
||||
+ mblength = mbrlen (delims + i, slength, &state);
|
||||
+
|
||||
+ if (MB_INVALIDCH (mblength))
|
||||
+ state = state_bak;
|
||||
+ else if (mblength != 1)
|
||||
+ {
|
||||
+ memcpy (d2 + ts, delims + i, mblength);
|
||||
+ ts += mblength;
|
||||
+ i += mblength;
|
||||
+ slength -= mblength;
|
||||
+ continue;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if (whitespace(delims[i]) == 0)
|
||||
d2[ts++] = delims[i];
|
||||
+ i++;
|
||||
+ slength--;
|
||||
}
|
||||
d2[ts] = '\0';
|
||||
}
|
||||
@@ -1654,10 +1737,19 @@
|
||||
string_list_dollar_star (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ char sep[MB_CUR_MAX + 1];
|
||||
+#else
|
||||
char sep[2];
|
||||
+#endif
|
||||
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ memcpy (sep, ifs_firstc, ifs_firstc_len);
|
||||
+ sep[ifs_firstc_len] = '\0';
|
||||
+#else
|
||||
sep[0] = ifs_firstc;
|
||||
sep[1] = '\0';
|
||||
+#endif
|
||||
|
||||
return (string_list_internal (list, sep));
|
||||
}
|
||||
@@ -1676,14 +1768,41 @@
|
||||
WORD_LIST *list;
|
||||
int quoted;
|
||||
{
|
||||
- char *ifs, sep[2];
|
||||
+ char *ifs;
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ char sep[MB_CUR_MAX + 1];
|
||||
+#else
|
||||
+ char sep[2];
|
||||
+#endif
|
||||
WORD_LIST *tlist;
|
||||
|
||||
/* XXX this could just be ifs = ifs_value; */
|
||||
ifs = ifs_var ? value_cell (ifs_var) : (char *)0;
|
||||
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ if (ifs && *ifs)
|
||||
+ {
|
||||
+ size_t mblength = mblen (ifs, strnlen (ifs, MB_CUR_MAX));
|
||||
+ if (MB_INVALIDCH (mblength))
|
||||
+ {
|
||||
+ sep[0] = *ifs;
|
||||
+ sep[1] = '\0';
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ memcpy (sep, ifs, mblength);
|
||||
+ sep[mblength] = '\0';
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ sep[0] = ' ';
|
||||
+ sep[1] = '\0';
|
||||
+ }
|
||||
+#else
|
||||
sep[0] = (ifs == 0 || *ifs == 0) ? ' ' : *ifs;
|
||||
sep[1] = '\0';
|
||||
+#endif
|
||||
|
||||
tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0))
|
||||
? quote_list (list)
|
||||
@@ -1732,6 +1851,7 @@
|
||||
WORD_DESC *t;
|
||||
char *current_word, *s;
|
||||
int sindex, sh_style_split, whitesep;
|
||||
+ size_t slen = 0;
|
||||
|
||||
if (!string || !*string)
|
||||
return ((WORD_LIST *)NULL);
|
||||
@@ -1805,7 +1925,12 @@
|
||||
|
||||
/* Move past the current separator character. */
|
||||
if (string[sindex])
|
||||
- sindex++;
|
||||
+ {
|
||||
+ DECLARE_MBSTATE;
|
||||
+ if (!slen)
|
||||
+ slen = strlen (string);
|
||||
+ ADVANCE_CHAR (string, slen, sindex);
|
||||
+ }
|
||||
|
||||
/* Now skip sequences of space, tab, or newline characters if they are
|
||||
in the list of separators. */
|
||||
@@ -6796,7 +6921,27 @@
|
||||
ifs_cmap[uc] = 1;
|
||||
}
|
||||
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+ if (!ifs_value)
|
||||
+ {
|
||||
+ ifs_firstc[0] = '\0';
|
||||
+ ifs_firstc_len = 1;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ size_t ifs_len = strnlen (ifs_value, MB_CUR_MAX);
|
||||
+ ifs_firstc_len = mblen (ifs_value, ifs_len);
|
||||
+ if (MB_INVALIDCH (ifs_firstc_len))
|
||||
+ {
|
||||
+ ifs_firstc[0] = '\0';
|
||||
+ ifs_firstc_len = 1;
|
||||
+ }
|
||||
+ else
|
||||
+ memcpy (ifs_firstc, ifs_value, ifs_firstc_len);
|
||||
+ }
|
||||
+#else
|
||||
ifs_firstc = ifs_value ? *ifs_value : 0;
|
||||
+#endif
|
||||
}
|
||||
|
||||
char *
|
||||
--- bash-3.0/subst.h.multibyteifs 2004-08-20 15:51:08.301074583 +0100
|
||||
+++ bash-3.0/subst.h 2004-08-20 15:51:39.070206473 +0100
|
||||
@@ -231,7 +231,12 @@
|
||||
extern SHELL_VAR *ifs_var;
|
||||
extern char *ifs_value;
|
||||
extern unsigned char ifs_cmap[];
|
||||
+#if defined (HANDLE_MULTIBYTE)
|
||||
+extern unsigned char ifs_firstc[];
|
||||
+extern size_t ifs_firstc_len;
|
||||
+#else
|
||||
extern unsigned char ifs_firstc;
|
||||
+#endif
|
||||
|
||||
/* Evaluates to 1 if C is a character in $IFS. */
|
||||
#define isifs(c) (ifs_cmap[(unsigned char)(c)] != 0)
|
||||
@ -1,16 +0,0 @@
|
||||
Ripped from Fedora
|
||||
|
||||
* Tue Mar 15 2005 Tim Waugh <twaugh@redhat.com> 3.0-30
|
||||
- Fix PS1 expansion crash when PWD is unset (bg #151116).
|
||||
|
||||
--- bash-3.0/parse.y.pwd 2005-03-15 14:22:36.000000000 +0000
|
||||
+++ bash-3.0/parse.y 2005-03-15 14:22:37.000000000 +0000
|
||||
@@ -4103,7 +4103,7 @@
|
||||
#define ROOT_PATH(x) ((x)[0] == '/' && (x)[1] == 0)
|
||||
#define DOUBLE_SLASH_ROOT(x) ((x)[0] == '/' && (x)[1] == '/' && (x)[2] == 0)
|
||||
/* Abbreviate \W as ~ if $PWD == $HOME */
|
||||
- if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, temp) == 0))
|
||||
+ if (c == 'W' && (((t = get_string_value ("HOME")) == 0) || STREQ (t, t_string) == 0))
|
||||
{
|
||||
if (ROOT_PATH (t_string) == 0 && DOUBLE_SLASH_ROOT (t_string) == 0)
|
||||
{
|
||||
@ -1,39 +0,0 @@
|
||||
Ripped from Fedora which took this from upstream
|
||||
|
||||
* Tue Nov 22 2005 Tim Waugh <twaugh@redhat.com> 3.0-37
|
||||
- Applied patch from upstream to fix parsing problem (bug #146638).
|
||||
|
||||
http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146638
|
||||
|
||||
--- bash-3.0/parse.y.subshell 2005-11-22 13:19:11.000000000 +0000
|
||||
+++ bash-3.0/parse.y 2005-11-22 13:19:24.000000000 +0000
|
||||
@@ -2055,14 +2055,6 @@
|
||||
if (uc)
|
||||
shell_input_line_index++;
|
||||
|
||||
- if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
|
||||
- {
|
||||
- if (SHOULD_PROMPT ())
|
||||
- prompt_again ();
|
||||
- line_number++;
|
||||
- goto restart_read;
|
||||
- }
|
||||
-
|
||||
#if defined (ALIAS) || defined (DPAREN_ARITHMETIC)
|
||||
/* If UC is NULL, we have reached the end of the current input string. If
|
||||
pushed_string_list is non-empty, it's time to pop to the previous string
|
||||
@@ -2078,6 +2070,14 @@
|
||||
}
|
||||
#endif /* ALIAS || DPAREN_ARITHMETIC */
|
||||
|
||||
+ if MBTEST(uc == '\\' && remove_quoted_newline && shell_input_line[shell_input_line_index] == '\n')
|
||||
+ {
|
||||
+ if (SHOULD_PROMPT ())
|
||||
+ prompt_again ();
|
||||
+ line_number++;
|
||||
+ goto restart_read;
|
||||
+ }
|
||||
+
|
||||
if (!uc && shell_input_line_terminator == EOF)
|
||||
return ((shell_input_line_index != 0) ? '\n' : EOF);
|
||||
|
||||
@ -1,186 +0,0 @@
|
||||
Ripped from Fedora
|
||||
|
||||
--- bash-3.0/builtins/ulimit.def
|
||||
+++ bash-3.0/builtins/ulimit.def
|
||||
@@ -34,15 +34,20 @@
|
||||
-a all current limits are reported
|
||||
-c the maximum size of core files created
|
||||
-d the maximum size of a process's data segment
|
||||
+ -e the maximum scheduling priority (`nice')
|
||||
-f the maximum size of files created by the shell
|
||||
+ -i the maximum number of pending signals
|
||||
-l the maximum size a process may lock into memory
|
||||
-m the maximum resident set size
|
||||
-n the maximum number of open file descriptors
|
||||
-p the pipe buffer size
|
||||
+ -q the maximum number of bytes in POSIX message queues
|
||||
+ -r the maximum rt priority
|
||||
-s the maximum stack size
|
||||
-t the maximum amount of cpu time in seconds
|
||||
-u the maximum number of user processes
|
||||
-v the size of virtual memory
|
||||
+ -x the maximum number of file locks
|
||||
|
||||
If LIMIT is given, it is the new value of the specified resource;
|
||||
the special LIMIT values `soft', `hard', and `unlimited' stand for
|
||||
@@ -199,7 +204,13 @@
|
||||
#ifdef RLIMIT_DATA
|
||||
{ 'd', RLIMIT_DATA, 1024, "data seg size", "kbytes" },
|
||||
#endif
|
||||
+#ifdef RLIMIT_NICE
|
||||
+ { 'e', RLIMIT_NICE, 1, "max nice", (char *)NULL},
|
||||
+#endif /* RLIMIT_NICE */
|
||||
{ 'f', RLIMIT_FILESIZE, 1024, "file size", "blocks" },
|
||||
+#ifdef RLIMIT_SIGPENDING
|
||||
+ { 'i', RLIMIT_SIGPENDING, 1, "pending signals", (char *)NULL},
|
||||
+#endif
|
||||
#ifdef RLIMIT_MEMLOCK
|
||||
{ 'l', RLIMIT_MEMLOCK, 1024, "max locked memory", "kbytes" },
|
||||
#endif
|
||||
@@ -208,6 +219,12 @@
|
||||
#endif /* RLIMIT_RSS */
|
||||
{ 'n', RLIMIT_OPENFILES, 1, "open files", (char *)NULL},
|
||||
{ 'p', RLIMIT_PIPESIZE, 512, "pipe size", "512 bytes" },
|
||||
+#ifdef RLIMIT_MSGQUEUE
|
||||
+ { 'q', RLIMIT_MSGQUEUE, 1, "POSIX message queues", "bytes" },
|
||||
+#endif
|
||||
+#ifdef RLIMIT_RTPRIO
|
||||
+ { 'r', RLIMIT_RTPRIO, 1, "max rt priority", (char *)NULL},
|
||||
+#endif /* RLIMIT_RTPRIO */
|
||||
#ifdef RLIMIT_STACK
|
||||
{ 's', RLIMIT_STACK, 1024, "stack size", "kbytes" },
|
||||
#endif
|
||||
@@ -221,6 +238,9 @@
|
||||
#ifdef RLIMIT_SWAP
|
||||
{ 'w', RLIMIT_SWAP, 1024, "swap size", "kbytes" },
|
||||
#endif
|
||||
+#ifdef RLIMIT_LOCKS
|
||||
+ { 'x', RLIMIT_LOCKS, 1, "file locks", (char *)NULL},
|
||||
+#endif
|
||||
{ -1, -1, -1, (char *)NULL, (char *)NULL }
|
||||
};
|
||||
#define NCMDS (sizeof(limits) / sizeof(limits[0]))
|
||||
@@ -647,11 +667,11 @@
|
||||
|
||||
for (i = 0; limits[i].option > 0; i++)
|
||||
{
|
||||
- if (get_limit (i, &softlim, &hardlim) < 0)
|
||||
+ if (get_limit (i, &softlim, &hardlim) == 0)
|
||||
+ printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
|
||||
+ else if (errno != EINVAL)
|
||||
builtin_error ("%s: cannot get limit: %s", limits[i].description,
|
||||
strerror (errno));
|
||||
- else
|
||||
- printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -670,7 +690,7 @@
|
||||
else
|
||||
sprintf (unitstr, "(-%c) ", limits[limind].option);
|
||||
|
||||
- printf ("%-18s %16s", limits[limind].description, unitstr);
|
||||
+ printf ("%-20s %16s", limits[limind].description, unitstr);
|
||||
}
|
||||
if (curlim == RLIM_INFINITY)
|
||||
puts ("unlimited");
|
||||
--- bash-3.0/doc/bashref.texi
|
||||
+++ bash-3.0/doc/bashref.texi
|
||||
@@ -3793,7 +3793,7 @@
|
||||
@item ulimit
|
||||
@btindex ulimit
|
||||
@example
|
||||
-ulimit [-acdflmnpstuvSH] [@var{limit}]
|
||||
+ulimit [-acdeflmnpqrstuvxSH] [@var{limit}]
|
||||
@end example
|
||||
@code{ulimit} provides control over the resources available to processes
|
||||
started by the shell, on systems that allow such control. If an
|
||||
@@ -3814,9 +3814,15 @@
|
||||
@item -d
|
||||
The maximum size of a process's data segment.
|
||||
|
||||
+@item -e
|
||||
+The maximum scheduling priority.
|
||||
+
|
||||
@item -f
|
||||
The maximum size of files created by the shell.
|
||||
|
||||
+@item -i
|
||||
+The maximum number of pending signals.
|
||||
+
|
||||
@item -l
|
||||
The maximum size that may be locked into memory.
|
||||
|
||||
@@ -3829,6 +3835,12 @@
|
||||
@item -p
|
||||
The pipe buffer size.
|
||||
|
||||
+@item -q
|
||||
+The maximum number of bytes in POSIX message queues.
|
||||
+
|
||||
+@item -r
|
||||
+The maximum RT priority.
|
||||
+
|
||||
@item -s
|
||||
The maximum stack size.
|
||||
|
||||
@@ -3841,6 +3853,9 @@
|
||||
@item -v
|
||||
The maximum amount of virtual memory available to the process.
|
||||
|
||||
+@item -x
|
||||
+The maximum amount of file locks.
|
||||
+
|
||||
@end table
|
||||
|
||||
If @var{limit} is given, it is the new value of the specified resource;
|
||||
--- bash-3.0/doc/bash.1
|
||||
+++ bash-3.0/doc/bash.1
|
||||
@@ -8362,7 +8362,7 @@
|
||||
returns true if any of the arguments are found, false if
|
||||
none are found.
|
||||
.TP
|
||||
-\fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]]
|
||||
+\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]]
|
||||
Provides control over the resources available to the shell and to
|
||||
processes started by it, on systems that allow such control.
|
||||
The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is
|
||||
@@ -8398,9 +8398,15 @@
|
||||
.B \-d
|
||||
The maximum size of a process's data segment
|
||||
.TP
|
||||
+.B \-e
|
||||
+The maximum scheduling priority (`nice')
|
||||
+.TP
|
||||
.B \-f
|
||||
The maximum size of files created by the shell
|
||||
.TP
|
||||
+.B \-i
|
||||
+The maximum number of pending signals
|
||||
+.TP
|
||||
.B \-l
|
||||
The maximum size that may be locked into memory
|
||||
.TP
|
||||
@@ -8414,6 +8420,12 @@
|
||||
.B \-p
|
||||
The pipe size in 512-byte blocks (this may not be set)
|
||||
.TP
|
||||
+.B \-q
|
||||
+The maximum number of bytes in POSIX message queues
|
||||
+.TP
|
||||
+.B \-r
|
||||
+The maximum rt priority
|
||||
+.TP
|
||||
.B \-s
|
||||
The maximum stack size
|
||||
.TP
|
||||
@@ -8425,6 +8437,9 @@
|
||||
.TP
|
||||
.B \-v
|
||||
The maximum amount of virtual memory available to the shell
|
||||
+.TP
|
||||
+.B \-x
|
||||
+The maximum number of file locks
|
||||
.PD
|
||||
.PP
|
||||
If
|
||||
@ -1,16 +0,0 @@
|
||||
Ripped from Debian
|
||||
|
||||
# DP: current_command must be declared volatile to prevent assignments from
|
||||
# being optimized away as dead code. In reality, the use of setjmp/longjmp
|
||||
# makes it not dead code at all.
|
||||
|
||||
--- eval.old 2003-12-18 23:44:15.000000000 -0500
|
||||
+++ eval.c 2005-10-03 01:59:31.000000000 -0400
|
||||
@@ -63,7 +63,7 @@
|
||||
reader_loop ()
|
||||
{
|
||||
int our_indirection_level;
|
||||
- COMMAND *current_command = (COMMAND *)NULL;
|
||||
+ COMMAND * volatile current_command = (COMMAND *)NULL;
|
||||
|
||||
USE_VAR(current_command);
|
||||
@ -1,93 +0,0 @@
|
||||
http://bugs.gentoo.org/337329
|
||||
http://bugs.gentoo.org/527848
|
||||
|
||||
there's no requirement for `echo` to support escape sequences. bash, by default,
|
||||
does not, while dash always does. POSIX permits either behavior:
|
||||
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html
|
||||
|
||||
however, since the behavior is not portable, no one should be relying on echo
|
||||
having any specific behavior. they should use `printf` when they want an escape
|
||||
sequence. it also makes dash smaller & faster to disable this logic entirely.
|
||||
|
||||
--- a/src/bltin/printf.c
|
||||
+++ b/src/bltin/printf.c
|
||||
@@ -442,21 +442,12 @@
|
||||
int
|
||||
echocmd(int argc, char **argv)
|
||||
{
|
||||
- int nonl;
|
||||
-
|
||||
- nonl = *++argv ? equal(*argv, "-n") : 0;
|
||||
- argv += nonl;
|
||||
-
|
||||
- do {
|
||||
- int c;
|
||||
-
|
||||
- if (likely(*argv))
|
||||
- nonl += print_escape_str("%s", NULL, NULL, *argv++);
|
||||
- if (nonl > 0)
|
||||
- break;
|
||||
-
|
||||
- c = *argv ? ' ' : '\n';
|
||||
- out1c(c);
|
||||
- } while (*argv);
|
||||
+ int i;
|
||||
+ for (i = 1; i < argc; ++i) {
|
||||
+ outstr(argv[i], out1);
|
||||
+ if (i < argc - 1)
|
||||
+ outc(' ', out1);
|
||||
+ }
|
||||
+ outc('\n', out1);
|
||||
return 0;
|
||||
}
|
||||
--- a/src/dash.1
|
||||
+++ b/src/dash.1
|
||||
@@ -1182,43 +1182,15 @@
|
||||
option turns off the effect of any preceding
|
||||
.Fl P
|
||||
options.
|
||||
-.It Xo echo Op Fl n
|
||||
+.It Xo echo
|
||||
.Ar args...
|
||||
.Xc
|
||||
Print the arguments on the standard output, separated by spaces.
|
||||
-Unless the
|
||||
-.Fl n
|
||||
-option is present, a newline is output following the arguments.
|
||||
-.Pp
|
||||
-If any of the following sequences of characters is encountered during
|
||||
-output, the sequence is not output. Instead, the specified action is
|
||||
-performed:
|
||||
-.Bl -tag -width indent
|
||||
-.It Li \eb
|
||||
-A backspace character is output.
|
||||
-.It Li \ec
|
||||
-Subsequent output is suppressed. This is normally used at the end of the
|
||||
-last argument to suppress the trailing newline that
|
||||
-.Ic echo
|
||||
-would otherwise output.
|
||||
-.It Li \ef
|
||||
-Output a form feed.
|
||||
-.It Li \en
|
||||
-Output a newline character.
|
||||
-.It Li \er
|
||||
-Output a carriage return.
|
||||
-.It Li \et
|
||||
-Output a (horizontal) tab character.
|
||||
-.It Li \ev
|
||||
-Output a vertical tab.
|
||||
-.It Li \e0 Ns Ar digits
|
||||
-Output the character whose value is given by zero to three octal digits.
|
||||
-If there are zero digits, a nul character is output.
|
||||
-.It Li \e\e
|
||||
-Output a backslash.
|
||||
-.El
|
||||
.Pp
|
||||
-All other backslash sequences elicit undefined behaviour.
|
||||
+No arguments or backslash sequences are supported as they are not portable.
|
||||
+They will be printed out exactly as passed in.
|
||||
+.Pp
|
||||
+You can replace `echo -n ...` with the portable `printf %s ...` construct.
|
||||
.It eval Ar string ...
|
||||
Concatenate all the arguments with spaces.
|
||||
Then re-parse and execute the command.
|
||||
@ -0,0 +1,60 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Development library for simulation games"
|
||||
HOMEPAGE="http://www.simgear.org/"
|
||||
SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+dns debug gdal openmp subversion test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
dev-libs/expat
|
||||
>=dev-games/openscenegraph-3.2.0
|
||||
media-libs/openal
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/opengl
|
||||
dns? ( net-libs/udns )
|
||||
gdal? ( sci-libs/gdal )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/boost-1.44
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
subversion? ( dev-vcs/subversion )
|
||||
"
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DENABLE_DNS=$(usex dns)
|
||||
-DENABLE_GDAL=$(usex gdal)
|
||||
-DENABLE_OPENMP=$(usex openmp)
|
||||
-DENABLE_PKGUTIL=ON
|
||||
-DENABLE_RTI=OFF
|
||||
-DENABLE_SIMD=ON
|
||||
-DENABLE_SOUND=ON
|
||||
-DENABLE_TESTS=$(usex test)
|
||||
-DSIMGEAR_HEADLESS=OFF
|
||||
-DSIMGEAR_SHARED=ON
|
||||
-DSYSTEM_EXPAT=ON
|
||||
-DSYSTEM_UDNS=ON
|
||||
-DUSE_AEONWAVE=OFF
|
||||
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST libmspack-0.5alpha.tar.gz 654193 SHA256 8967f275525f5067b364cee43b73e44d0433668c39f9376dfff19f653d1c8110 SHA512 6d4efa0f43c43185ef91c97c1518aa70f09109d7332cda7e12019e146ec9cb0f2065fb1b57683b48bae9a7eaf8e82eb94096644c6d25c56d45878f630b719231 WHIRLPOOL fcbbbdee1ce4c75222767ad7ce3e16d18c3fbf1c7cb60170a9cad51647e3500e11c458f7a65e8c2e0dccfb8a8e3981f13252ac26fd9edce6f633381b77410faf
|
||||
DIST libmspack-0.6alpha.tar.gz 476992 SHA256 1edbee82accb28e679ab538f803aab7a5a569e4102ccf1715b462b1bd915f921 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d WHIRLPOOL 5c8fb600af798cb7902c8a7233515004ffc2cc440a152d4296f6827910530259648f73f6e29fd75b5190057b9cf66ad1d180c58255450dbb6b23fce548ad5c73
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils multilib-minimal
|
||||
|
||||
MY_PV="${PV/_alpha/alpha}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
DESCRIPTION="A library for Microsoft compression formats"
|
||||
HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
|
||||
SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug doc static-libs"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
$(use_enable debug) \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
if multilib_is_native_abi; then
|
||||
default
|
||||
cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
DOCS=(AUTHORS ChangeLog NEWS README TODO)
|
||||
prune_libtool_files --all
|
||||
use doc && HTML_DOCS=(doc/*)
|
||||
default_src_install
|
||||
if use doc; then
|
||||
rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
|
||||
fi
|
||||
}
|
||||
@ -1,97 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="4"
|
||||
|
||||
PHP_EXT_NAME="uuid"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
USE_PHP="php5-4"
|
||||
|
||||
MY_P="uuid-${PV}"
|
||||
PHP_EXT_S="${WORKDIR}/${MY_P}/php"
|
||||
PHP_EXT_OPTIONAL_USE="php"
|
||||
|
||||
inherit eutils multilib php-ext-source-r2
|
||||
|
||||
DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID"
|
||||
HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
|
||||
SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE="+cxx perl php static-libs"
|
||||
|
||||
DEPEND="perl? ( dev-lang/perl )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_prepare() {
|
||||
|
||||
epatch \
|
||||
"${FILESDIR}/${P}-gentoo-r1.patch" \
|
||||
"${FILESDIR}/${P}-gentoo-perl.patch"
|
||||
|
||||
if use php; then
|
||||
local slot
|
||||
for slot in $(php_get_slots); do
|
||||
php_init_slot_env ${slot}
|
||||
epatch \
|
||||
"${FILESDIR}/${P}-gentoo-php.patch" \
|
||||
"${FILESDIR}/${P}-php.patch"
|
||||
done
|
||||
|
||||
php-ext-source-r2_src_prepare
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Notes:
|
||||
# * collides with e2fstools libs and includes if not moved around
|
||||
# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
|
||||
econf \
|
||||
--includedir="${EPREFIX}"/usr/include/ossp \
|
||||
--with-dce \
|
||||
--without-pgsql \
|
||||
--without-php \
|
||||
$(use_with cxx) \
|
||||
$(use_with perl) \
|
||||
$(use_enable static-libs static)
|
||||
|
||||
if use php; then
|
||||
php-ext-source-r2_src_configure
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
if use php; then
|
||||
php-ext-source-r2_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS="AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS"
|
||||
default
|
||||
|
||||
if use php ; then
|
||||
php-ext-source-r2_src_install
|
||||
cd "${S}/php"
|
||||
insinto /usr/share/php
|
||||
newins uuid.php5 uuid.php
|
||||
fi
|
||||
|
||||
use static-libs || rm -rf "${ED}"/usr/lib*/*.la
|
||||
|
||||
mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
|
||||
mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
|
||||
mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
|
||||
}
|
||||
|
||||
src_test() {
|
||||
export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
|
||||
default
|
||||
}
|
||||
@ -1,118 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
MY_P="uuid-${PV}"
|
||||
|
||||
PHP_EXT_NAME="uuid"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
PHP_EXT_S="${WORKDIR}/${MY_P}/php"
|
||||
PHP_EXT_OPTIONAL_USE="php"
|
||||
USE_PHP="php5-6 php5-5"
|
||||
|
||||
GENTOO_DEPEND_ON_PERL="no"
|
||||
|
||||
inherit eutils multilib perl-module php-ext-source-r2
|
||||
|
||||
DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID"
|
||||
HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
|
||||
SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="ISC"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE="+cxx perl php static-libs"
|
||||
|
||||
DEPEND="perl? ( dev-lang/perl:= )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_prepare() {
|
||||
|
||||
epatch \
|
||||
"${FILESDIR}/${P}-gentoo-r1.patch" \
|
||||
"${FILESDIR}/${P}-gentoo-perl.patch" \
|
||||
"${FILESDIR}/${P}-hwaddr.patch" \
|
||||
"${FILESDIR}/${P}-manfix.patch" \
|
||||
"${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch" \
|
||||
"${FILESDIR}/${P}-fix-whatis-entries.patch" \
|
||||
"${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
|
||||
|
||||
if use php; then
|
||||
local slot
|
||||
for slot in $(php_get_slots); do
|
||||
php_init_slot_env ${slot}
|
||||
epatch \
|
||||
"${FILESDIR}/${P}-gentoo-php.patch" \
|
||||
"${FILESDIR}/${P}-php.patch"
|
||||
done
|
||||
|
||||
php-ext-source-r2_src_prepare
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Notes:
|
||||
# * collides with e2fstools libs and includes if not moved around
|
||||
# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
|
||||
econf \
|
||||
--includedir="${EPREFIX}"/usr/include/ossp \
|
||||
--with-dce \
|
||||
--without-pgsql \
|
||||
--without-perl \
|
||||
--without-php \
|
||||
$(use_with cxx) \
|
||||
$(use_enable static-libs static)
|
||||
|
||||
if use php; then
|
||||
php-ext-source-r2_src_configure
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
if use perl; then
|
||||
cd perl
|
||||
# configure needs the ossp-uuid.la generated by `make` in $S
|
||||
perl-module_src_configure
|
||||
perl-module_src_compile
|
||||
fi
|
||||
|
||||
if use php; then
|
||||
php-ext-source-r2_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS="AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS"
|
||||
default
|
||||
|
||||
if use perl ; then
|
||||
cd perl
|
||||
perl-module_src_install
|
||||
fi
|
||||
|
||||
if use php ; then
|
||||
php-ext-source-r2_src_install
|
||||
cd "${S}/php"
|
||||
insinto /usr/share/php
|
||||
newins uuid.php5 uuid.php
|
||||
fi
|
||||
|
||||
use static-libs || rm -rf "${ED}"/usr/lib*/*.la
|
||||
|
||||
mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
|
||||
mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
|
||||
mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
|
||||
}
|
||||
|
||||
src_test() {
|
||||
export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
|
||||
default
|
||||
|
||||
use perl && emake -C perl test
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
From 509fd6a054de9408ce9032e93fff61f6bdbc568a Mon Sep 17 00:00:00 2001
|
||||
From: Brian Evans <grknight@gentoo.org>
|
||||
Date: Fri, 13 Oct 2017 15:03:50 -0400
|
||||
Subject: Fix building/linking against MariaDB 10.2
|
||||
|
||||
Bug: https://bugs.gentoo.org/634192
|
||||
---
|
||||
mysql.xs | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mysql.xs b/mysql.xs
|
||||
index 13c6a57..6de3c8e 100644
|
||||
--- a/mysql.xs
|
||||
+++ b/mysql.xs
|
||||
@@ -790,7 +790,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
|
||||
D_imp_dbh(dbh);
|
||||
IV type = 0;
|
||||
SV* retsv=NULL;
|
||||
-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
|
||||
+#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202
|
||||
/* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/
|
||||
IV buffer_len;
|
||||
#endif
|
||||
@@ -822,7 +822,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
|
||||
retsv = newSVpvn("`", 1);
|
||||
break;
|
||||
case SQL_MAXIMUM_STATEMENT_LENGTH:
|
||||
-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
|
||||
+#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202
|
||||
/* MariaDB 10 is not MySQL source level compatible so this
|
||||
only applies to MySQL*/
|
||||
/* mysql_get_option() was added in mysql 5.7.3 */
|
||||
--
|
||||
2.14.2
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=ILMARI
|
||||
DIST_VERSION=0.02003
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Auto-create NetAddr::IP objects from columns"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-perl/NetAddr-IP
|
||||
>=dev-perl/DBIx-Class-0.81.70
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-perl/DBD-SQLite )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's/use inc::Module::Install /use lib q[.];\nuse inc::Module::Install /' Makefile.PL ||
|
||||
die "Can't patch Makefile.PL for 5.26 dot-in-inc"
|
||||
perl-module_src_prepare
|
||||
}
|
||||
|
||||
src_test() {
|
||||
perl_rm_files t/pod-coverage.t t/pod.t t/style-notabs.t
|
||||
perl-module_src_test
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=JGOULAH
|
||||
DIST_VERSION=0.11
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Automatically set update and create user id fields"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="dev-perl/Class-Accessor-Grouped
|
||||
dev-perl/DBIx-Class-DynamicDefault
|
||||
dev-perl/DBIx-Class"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-perl/DBD-SQLite )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
|
||||
die "Can't patch Makefile.PL for 5.26 dot-in-inc"
|
||||
perl-module_src_prepare
|
||||
}
|
||||
# Parallel tests fail sometimes due to sharing a sqlite db path
|
||||
# and recreating the same table
|
||||
DIST_TEST="do"
|
||||
src_test() {
|
||||
perl_rm_files t/02pod.t t/03podcoverage.t
|
||||
perl-module_src_test
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=TURNSTEP
|
||||
DIST_VERSION=1.2.5
|
||||
inherit perl-module eutils
|
||||
|
||||
DESCRIPTION="Safer access to your database through a DBI database handle"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
LICENSE="BSD-2"
|
||||
|
||||
RDEPEND="dev-perl/DBI
|
||||
dev-perl/DBD-Pg"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_test() {
|
||||
perl_rm_files t/02perlcritic.t
|
||||
if [[ -z "${DBI_DSN}" ]]; then
|
||||
ewarn "Comprehensive testing of this package requires some manual configuration."
|
||||
ewarn "For details, see:"
|
||||
ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBIx-Safe"
|
||||
fi
|
||||
perl-module_src_test
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=MATTP
|
||||
DIST_VERSION=0.002009
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Base classes wrapping fundamental Perl data types"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-perl/Class-Method-Modifiers
|
||||
dev-perl/List-MoreUtils
|
||||
virtual/perl-Scalar-List-Utils
|
||||
dev-perl/Module-Runtime
|
||||
dev-perl/Role-Tiny
|
||||
virtual/perl-parent
|
||||
dev-perl/strictures
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? (
|
||||
dev-perl/Test-Deep
|
||||
dev-perl/Test-Fatal
|
||||
dev-perl/Test-Output
|
||||
)
|
||||
"
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=NEELY
|
||||
DIST_VERSION=0.60
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Modules that serialize data structures"
|
||||
LICENSE="|| ( Artistic GPL-2 )"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-AutoLoader
|
||||
virtual/perl-Data-Dumper
|
||||
virtual/perl-Digest-SHA
|
||||
virtual/perl-Exporter
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-File-Spec
|
||||
dev-perl/Module-Build
|
||||
test? ( virtual/perl-Test-Simple )
|
||||
"
|
||||
# Parallelism broken: https://rt.cpan.org/Ticket/Display.html?id=123331
|
||||
DIST_TEST="do"
|
||||
|
||||
src_test() {
|
||||
ewarn "Additional dependencies may need installation for comprehensive tests."
|
||||
ewarn "For details, see:"
|
||||
ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Data-Serializer"
|
||||
perl-module_src_test
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=JHOBLITT
|
||||
DIST_VERSION=0.01
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Create DateTime objects with sub-second current time resolution"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-perl/DateTime"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-perl/Module-Build"
|
||||
PATCHES=("${FILESDIR}/${P}-datetimelocale.patch" )
|
||||
@ -0,0 +1,39 @@
|
||||
From 39dca8357ffbc562d1a4138586795a32e2a0c8ea Mon Sep 17 00:00:00 2001
|
||||
From: Roy Ivy III <rivy.dev@gmail.com>
|
||||
Date: Mon, 6 Jun 2016 14:03:59 -0500
|
||||
Subject: fix locale testing bug, accepting both old and new canonical locale
|
||||
forms
|
||||
|
||||
* fixes #1
|
||||
* fixes [rt-bug#109088]
|
||||
|
||||
.# Discussion
|
||||
|
||||
In v1.00, DateTime::Locale changed the canonical form of locale to use dashes instead of
|
||||
underscrores (see [1]). This causes a failure within the "t/02_now.t" test, blocking
|
||||
unforced installs.
|
||||
|
||||
refs
|
||||
[1] https://github.com/autarch/DateTime-Locale/blob/v1.00/Changes#L44
|
||||
[rt-bug#109088] https://rt.cpan.org/Public/Bug/Display.html?id=109088 @@ https://archive.is/3RccB
|
||||
|
||||
Bug: https://rt.cpan.org/Public/Bug/Display.html?id=109088
|
||||
Bug: https://github.com/jhoblitt/DateTime-HiRes/pull/2
|
||||
---
|
||||
t/02_now.t | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/t/02_now.t b/t/02_now.t
|
||||
index 4eb1f74..fc55184 100644
|
||||
--- a/t/02_now.t
|
||||
+++ b/t/02_now.t
|
||||
@@ -32,5 +32,5 @@ use DateTime::HiRes;
|
||||
);
|
||||
|
||||
is( $dt->time_zone_long_name, 'Africa/Cairo', "accepted time_zone parameter" );
|
||||
- is( $dt->locale->id, 'ar_EG', "accepted locale parameter" );
|
||||
+ like( $dt->locale->id, qr'ar[_-]EG', "accepted locale parameter" );
|
||||
}
|
||||
--
|
||||
2.14.2
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=DROLSKY
|
||||
DIST_VERSION=2.02
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="An object representing a stack trace"
|
||||
|
||||
LICENSE="Artistic-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-File-Spec
|
||||
virtual/perl-Scalar-List-Utils
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? (
|
||||
>=virtual/perl-Test-Simple-0.960.0
|
||||
)
|
||||
"
|
||||
|
||||
src_test() {
|
||||
perl_rm_files t/author-* t/release-*
|
||||
perl-module_src_test
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST Devel-StackTrace-2.00.tar.gz 30012 SHA256 1debe7273099a60e1386e0da5edbed7334db3cf3ed8e3b4106b087100b8ec5e4 SHA512 3a91249dd6c6da34ceeb66d947c269e360503f193b57acbed76671b030de4d2f7e9bf2c0cc4104777fbfd1dc610c06cf3c1e21b914334bb068b66875cc4e2af7 WHIRLPOOL ef97a2d5eaf2fdee6d6748bf9c32fbe795c3e8a7d475344279f65ed04ee7476b3eeb32d3ee6ec54355de663694dd8892d07ebbb22fd30242e290099584fd5499
|
||||
DIST Devel-StackTrace-2.01.tar.gz 33728 SHA256 055d35b5dbe62b88af7a15b347f7759cacb376dda345e0bd092a549384c30c13 SHA512 12f7192973f6eb4833140e0c1fbb76c1b0851803b39c805ae4012fc51506ce6e651edec9046322ac2b105412222d227a792a69cc257e316cff4a557bc90cdced WHIRLPOOL 0417a89da61e040066aee9a11a4d164e45ae9575a702b8d11bc78b6fdecc0f134e71ab6681313612388ddfb5ad0d4073dfa8d05b14a21aa6d97e1ef0f04ba9fe
|
||||
DIST Devel-StackTrace-2.02.tar.gz 38221 SHA256 cbbd96db0ecf194ed140198090eaea0e327d9a378a4aa15f9a34b3138a91931f SHA512 1744597ea86e0631a2f0b730f0448af21639f2360a95baecd47542bcd9be96163904ec438a34f70e794695046bac9751ece0e4705af95e717a5143295fce31db WHIRLPOOL 8c340bc3e849db178de0e2d8375ddcc97009d96576c3667eea4cb6d298cd9683403daaebbb07b1ca4743a5539622a09d52cab7438266a54c7a6a88d86c2fb3f3
|
||||
|
||||
@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=COOK
|
||||
DIST_VERSION=1.04
|
||||
DIST_EXAMPLES=("eg/*")
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A Serial port Perl Module"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
#From the module:
|
||||
# If you run 'make test', you must make sure that nothing is plugged
|
||||
# into '/dev/ttyS1'!
|
||||
# Doesn't sound wise to enable SRC_TEST="do" - mcummings
|
||||
|
||||
src_configure() {
|
||||
myconf=()
|
||||
[[ -n "${DEVICE_SERIALPORT_PORT}" ]] && myconf+=( "TESTPORT=${DEVICE_SERIALPORT_PORT}" )
|
||||
perl-module_src_configure
|
||||
}
|
||||
src_test() {
|
||||
local MODULES=(
|
||||
"Device::SerialPort ${DIST_VERSION}"
|
||||
)
|
||||
local failed=()
|
||||
for dep in "${MODULES[@]}"; do
|
||||
ebegin "Compile testing ${dep}"
|
||||
perl -Mblib="${S}" -M"${dep} ()" -e1
|
||||
eend $? || failed+=( "$dep" )
|
||||
done
|
||||
if [[ ${failed[@]} ]]; then
|
||||
echo
|
||||
eerror "One or more modules failed compile:";
|
||||
for dep in "${failed[@]}"; do
|
||||
eerror " ${dep}"
|
||||
done
|
||||
die "Failing due to module compilation errors";
|
||||
fi
|
||||
if [[ -n "${DEVICE_SERIALPORT_PORT}" ]]; then
|
||||
DIST_TEST="do"; # Parallel testing a serial port sounds unsmart.
|
||||
perl-module_src_test;
|
||||
else
|
||||
ewarn "Functional tests are disabled without manual intervention."
|
||||
ewarn "For details, read:"
|
||||
ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Device-SerialPort"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=GAAS
|
||||
DIST_VERSION=2.04
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Perl interface to the MD2 Algorithm"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
IUSE=""
|
||||
@ -1 +1,2 @@
|
||||
DIST Digest-MD2-2.03.tar.gz 17054 SHA256 c7e2b63596f99f2723b25256c8dc780228381c6d6a53dcb99844a6f06c6ee245 SHA512 78109efc43d7c3a58cb94fe100f31064988b581aa1c4726f679d13f09d7c89655f858b8fafb72f61005f955df75cd526e8532b02621ccc1f135fabaca31b292a WHIRLPOOL 2a193baadf8a615154f8a82b01a7467f5e140f37025bfb8a793c7fd21f539bbce1e9fe8817e4c9f811dd3cfed6a906b9683c959d22dfc55d194525e0e2dad1ea
|
||||
DIST Digest-MD2-2.04.tar.gz 17379 SHA256 d0aabf4834c20ac411bea427c4a308b59a5fcaa327679ef5294c1d68ab71eed3 SHA512 780ee79830fe8fcb3a844f67517c90d49a1e5e869dc8efd208d3eb73ccf6e56d3d112fcbd1effa083c4d77e5bddaab096b8aff9528707b235287761622b80433 WHIRLPOOL acb942ce0e6958f73df7a0001b83e638418fe33415e528b8d34b8af9e6b8a53473822091f6812a1718bc9a16e6200347bf56f74e7a9e9335d752dfa1221b8266
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=VIPUL
|
||||
DIST_VERSION=0.06
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Perl version of Nilsimsa code"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE=""
|
||||
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=ETHER
|
||||
DIST_VERSION=0.39
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A more awesome MakeMaker plugin for Dist::Zilla"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
XBLOCKS="
|
||||
!<=dev-perl/Dist-Zilla-Plugin-MakeMaker-Fallback-0.11.0
|
||||
"
|
||||
RDEPEND="${XBLOCKS}
|
||||
>=virtual/perl-CPAN-Meta-Requirements-2.121.0
|
||||
>=dev-perl/Dist-Zilla-5.1.0
|
||||
dev-perl/Moose
|
||||
dev-perl/MooseX-Types-Stringlike
|
||||
dev-perl/Path-Tiny
|
||||
>=virtual/perl-Scalar-List-Utils-1.290.0
|
||||
dev-perl/namespace-autoclean
|
||||
virtual/perl-version
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-perl/Module-Build-Tiny-0.34.0
|
||||
test? (
|
||||
>=dev-perl/CPAN-Meta-Check-0.11.0
|
||||
virtual/perl-File-Spec
|
||||
dev-perl/File-pushd
|
||||
virtual/perl-Module-Metadata
|
||||
dev-perl/Test-Deep
|
||||
dev-perl/Test-Fatal
|
||||
>=virtual/perl-Test-Simple-0.960.0
|
||||
virtual/perl-if
|
||||
)
|
||||
"
|
||||
@ -1 +1,2 @@
|
||||
DIST Dist-Zilla-Plugin-MakeMaker-Awesome-0.38.tar.gz 41950 SHA256 55200e8db5d72a4273bd146b78c8d9d9459ef580a0ba972f0a5b12182f999691 SHA512 66602030920f4e187eb026227cfcf6375ca4381ba79810e63cec41d44210f60c68ebb12629d6032893ac661c5116890b9121590ddc14b26aceffb33a63ef18ff WHIRLPOOL a32b1398db00058b92901cccbffbace8f180dc2a4e0a60dd48b5111e1b000d7ffdd359fb368cc541c99c5902793ee105657e4d311a706b9573058535f2021e5c
|
||||
DIST Dist-Zilla-Plugin-MakeMaker-Awesome-0.39.tar.gz 43621 SHA256 a314b50fb968bcb032871fe7b3ea8c4011ae5628ddcc9df429fbf80057ee5840 SHA512 b0e2f4c83759ff8ef040d507a52b4465b6eb5cd4b43db40169b49890e89e9b98d247dcaaf2be1ae5ea4d5804faa54c25bfc0e4349d38046fc05e1287ad91a42a WHIRLPOOL 3292330cc3a0d85222111e3317adfdde3d452c3d41adc2f59efda79fd212c6af45bfe689a416ec60a87dc9dd92b497950c13134a429fe1b4ad3fbd2db3b13ba8
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DIST_AUTHOR=PLICEASE
|
||||
DIST_VERSION=0.12
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="No line insertion and does Package version with our"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-Carp
|
||||
dev-perl/Dist-Zilla
|
||||
dev-perl/Moose
|
||||
dev-perl/MooseX-Types-Perl
|
||||
dev-perl/PPI
|
||||
dev-perl/namespace-autoclean
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? (
|
||||
>=virtual/perl-CPAN-Meta-2.120.900
|
||||
virtual/perl-File-Spec
|
||||
virtual/perl-IO
|
||||
dev-perl/Path-Tiny
|
||||
virtual/perl-Test-Simple
|
||||
dev-perl/Test-Version
|
||||
)
|
||||
"
|
||||
src_test() {
|
||||
perl_rm_files t/author-*.t t/release-*.t
|
||||
perl-module_src_test
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST Dist-Zilla-Plugin-OurPkgVersion-0.10.tar.gz 16513 SHA256 f9f87d27772a351540b4fb15c59ab2ebbf8cd0e7501fe2a7e151d1626b79be60 SHA512 086d3f12d5724e8d129bcb685428e3a6060eaa0ef00c661225b7f29f260b0aa7ecba6233f142e63d4af630090c5d7de7cc08a85ac13c0ed40e499a0301014ed8 WHIRLPOOL 5e6677c9570d90d5b8018228be7f219a05174bd421c4b20d7327620a1f71322d02e80cbcb2a7c3f1d6ffadb2750d8b2e52f213bcd4458eb98fa431c7afec2f53
|
||||
DIST Dist-Zilla-Plugin-OurPkgVersion-0.12.tar.gz 16929 SHA256 e59be5a9ba3b21e3d1b25cab0aa93d42d347d77e837002683592f5b168bdfc5f SHA512 6826c222bc402a747a6f7d05a0373b8c2b53121c10c0e5651fde54f389b51bdf45f808d823120f57f0cc75786c7fb7c5f3a2c80f08b7c0754377e97b2375b4a9 WHIRLPOOL 30328bf16798d79db2cdc96a67200bdfb342ce51adc3e5a736bf54b688a7aac1f16e35408f3e95aefaffe94e211496c900e5f2ad603fcc50517b1ddcf5b4f265
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST libvirt-php-0.5.2.tar.gz 770816 SHA256 f338caab2bebcce60cd62e3982ec4c1a274ecaf49d03cf7080b45f2f16cd516d SHA512 11844fea8507090826acd81fc7c257ecc3ed9cca10fc785e4d54b98ebd1e213310e379e7ca684c6439d9e2c57800a140fdc9953c6bec72da1959f5ed99e9ef31 WHIRLPOOL 19bde6afd0ef824557048d9f00aa1dd34f7138408326653e49c04a25e514575d1c2d92c462a8a9f40048ae2af7b2e46a27b66561cddf21fb8f28c294085700f5
|
||||
DIST libvirt-php-0.5.3.tar.gz 778604 SHA256 6cf9a5aa855cf973e4280c890d9da88a2a26a1e5a3c8bb555f885391467f85cf SHA512 b4cbfd8840d8f114fde762b5d6ada155ebdb231b554e28e8526a7af45a802a18f28e90fa52f3d7ca9f616996fe0a8289b70c2d14dca51a52a7bf8a501c3ff44f WHIRLPOOL fc379e7a216e7846dd6711816f19fac8497f67bee69fe66b904b86d40cc7064d941338941d6bb48e13d4fb1e0a8bff6421831c538a66f5b36556fff838d7f598
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
PHP_EXT_NAME="libvirt-php"
|
||||
PHP_EXT_SKIP_PHPIZE="yes"
|
||||
USE_PHP="php5-6"
|
||||
|
||||
inherit php-ext-source-r2 eutils
|
||||
|
||||
DESCRIPTION="PHP 5 bindings for libvirt"
|
||||
HOMEPAGE="http://libvirt.org/php/"
|
||||
SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND="app-emulation/libvirt
|
||||
dev-libs/libxml2"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-libs/libxslt
|
||||
doc? ( app-text/xhtml1 )"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
|
||||
# create the default modules directory to be able
|
||||
# to use the php-ext-source-r2 eclass to configure/build
|
||||
ln -s src "${S}/modules"
|
||||
|
||||
for slot in $(php_get_slots); do
|
||||
cp -r "${S}" "${WORKDIR}/${slot}"
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local slot
|
||||
for slot in $(php_get_slots); do
|
||||
php_init_slot_env ${slot}
|
||||
insinto "${EXT_DIR}"
|
||||
newins "src/.libs/${PHP_EXT_NAME}.so.0.0.0" "${PHP_EXT_NAME}.so"
|
||||
done
|
||||
php-ext-source-r2_createinifiles
|
||||
dodoc AUTHORS ChangeLog NEWS README
|
||||
use doc && dohtml docs/* docs/graphics/*
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Image Hashing library"
|
||||
HOMEPAGE="https://github.com/JohannesBuchner/imagehash"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/pillow[${PYTHON_USEDEP}]
|
||||
dev-python/pywavelets[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
sci-libs/scipy[${PYTHON_USEDEP}]"
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( ${RDEPEND} )"
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST ImageHash-3.4.tar.gz 290881 SHA256 22d5afa8089cfd08807e8133c2f03c81272e959f1dc922a2dc924c612f419841 SHA512 a4ba260988d81135f073bfc9a1b1253a69e8736da61e09ac93f8403ca237bfe85c3f0b4791546af601d62a306dd3346ecccf8ebd00d5cd8f4c6ca717b9d89dba WHIRLPOOL 0f4d837197db6a2407c0901403cb8c0effffb167d2517be0a7264fbec108d6f70739c980c00a648fe94b471273d2c6d52bd4f4e371cf9392e7c1177467077a08
|
||||
DIST ImageHash-3.7.tar.gz 294629 SHA256 09346020334afc317f79fe162928418f4b2c7e7e053638033f60339d39788c50 SHA512 e0da65d9d2a42ffce5c8b95017fd79bd002f48a963b956836695118e89bbb2ff936629a743248b4189439de155a0ec5f54a34d7cf7b803ae581b45f7bc02b500 WHIRLPOOL e3bb554a885c95669e1a2e02ccb8985d491d55b9b6e4df63a174f6cda71516c6c3e39b544574a620504017f7b9aa6b9683da66a6dfb1faf6852e72faf67e8d04
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST PyQt5_gpl-5.7.1.tar.gz 3733746 SHA256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f WHIRLPOOL 9322ccaaebf78a9e177703bae26f002cdfe9ad3ba45a9c7b9ccdd3b73cca96550e479b243b302d59eefdc1520a6e5b5f18ac5fabc1f8eff36f7f76d71b7dea11
|
||||
DIST PyQt5_gpl-5.8.2.tar.gz 3744907 SHA256 ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8 SHA512 8b765b9ae6210b7312a2dc6ed94d2664ae569625fe8a27443bae4230d9d9c00e0cf3b4be6904c66ebceff5cd5bbd19a5a9794a0b3222c8098a55f0b94fc8d89b WHIRLPOOL a2cf7d65f73b0cba7d37339e22b4bb8d3a4a924dbbd4d093943e299cf4d96dfd66e81ecfc4a5bf570f37f33eaad458849d7ef93ea22b115eece88866067f2e22
|
||||
DIST PyQt5_gpl-5.9.tar.gz 3097557 SHA256 ab0e7999cf202cc72962c78aefe461d16497b3c1a8282ab966ad90b6cb271096 SHA512 6e925dee751d6b2ab97b3614b0150f305798b89920e11db7a2cbef579e4c21839a38f4ad7eee5828a0c28942999955715a265e043004ee7838d376025d32e4aa WHIRLPOOL b92833ecc97638c8dac5e35de155ddb9d5783925aa8ab50bdd823b793675354b37edc29e17396241de87b25ae142c37a9cd1c215ad57c25b928ec0af3deac8aa
|
||||
|
||||
@ -0,0 +1,198 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
|
||||
inherit multibuild python-r1 qmake-utils
|
||||
|
||||
DESCRIPTION="Python bindings for the Qt framework"
|
||||
HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
|
||||
|
||||
MY_P=${PN}_gpl-${PV/_pre/.dev}
|
||||
if [[ ${PV} == *_pre* ]]; then
|
||||
SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
|
||||
else
|
||||
SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
|
||||
# TODO: QtNfc
|
||||
IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
|
||||
multimedia network opengl positioning printsupport sensors serialport sql svg
|
||||
testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
|
||||
|
||||
# The requirements below were extracted from configure.py
|
||||
# and from the output of 'grep -r "%Import " "${S}"/sip'
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
bluetooth? ( gui )
|
||||
declarative? ( gui network )
|
||||
designer? ( widgets )
|
||||
help? ( gui widgets )
|
||||
location? ( positioning )
|
||||
multimedia? ( gui network )
|
||||
opengl? ( gui widgets )
|
||||
positioning? ( gui )
|
||||
printsupport? ( gui widgets )
|
||||
sensors? ( gui )
|
||||
serialport? ( gui )
|
||||
sql? ( widgets )
|
||||
svg? ( gui widgets )
|
||||
testlib? ( gui widgets )
|
||||
webchannel? ( network )
|
||||
webengine? ( network widgets? ( webchannel ) )
|
||||
webkit? ( gui network printsupport widgets )
|
||||
websockets? ( network )
|
||||
widgets? ( gui )
|
||||
xmlpatterns? ( network )
|
||||
"
|
||||
|
||||
# Minimal supported version of Qt.
|
||||
QT_PV="5.6.0:5"
|
||||
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=dev-python/sip-4.19.3:=[${PYTHON_USEDEP}]
|
||||
>=dev-qt/qtcore-${QT_PV}
|
||||
>=dev-qt/qtxml-${QT_PV}
|
||||
bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
|
||||
dbus? (
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
>=dev-qt/qtdbus-${QT_PV}
|
||||
)
|
||||
declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
|
||||
designer? ( >=dev-qt/designer-${QT_PV} )
|
||||
gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
|
||||
help? ( >=dev-qt/qthelp-${QT_PV} )
|
||||
location? ( >=dev-qt/qtlocation-${QT_PV} )
|
||||
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
|
||||
network? ( >=dev-qt/qtnetwork-${QT_PV} )
|
||||
opengl? ( >=dev-qt/qtopengl-${QT_PV} )
|
||||
positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
|
||||
printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
|
||||
sensors? ( >=dev-qt/qtsensors-${QT_PV} )
|
||||
serialport? ( >=dev-qt/qtserialport-${QT_PV} )
|
||||
sql? ( >=dev-qt/qtsql-${QT_PV} )
|
||||
svg? ( >=dev-qt/qtsvg-${QT_PV} )
|
||||
testlib? ( >=dev-qt/qttest-${QT_PV} )
|
||||
webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
|
||||
webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
|
||||
webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
|
||||
websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
|
||||
widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
|
||||
x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
|
||||
xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dbus? ( virtual/pkgconfig )
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
DOCS=( "${S}"/{ChangeLog,NEWS} )
|
||||
|
||||
pyqt_use_enable() {
|
||||
use "$1" || return
|
||||
|
||||
if [[ $# -eq 1 ]]; then
|
||||
echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
|
||||
else
|
||||
shift
|
||||
echo ${@/#/--enable=}
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
configuration() {
|
||||
# Fix out-of-source build
|
||||
ln -s "${S}"/config-tests || die
|
||||
|
||||
local myconf=(
|
||||
"${PYTHON}"
|
||||
"${S}"/configure.py
|
||||
$(usex debug '--debug --qml-debug --trace' '')
|
||||
--verbose
|
||||
--confirm-license
|
||||
--qmake="$(qt5_get_bindir)"/qmake
|
||||
--bindir="${EPREFIX}/usr/bin"
|
||||
--destdir="$(python_get_sitedir)"
|
||||
--sip-incdir="$(python_get_includedir)"
|
||||
--qsci-api
|
||||
--enable=QtCore
|
||||
--enable=QtXml
|
||||
$(pyqt_use_enable bluetooth)
|
||||
$(pyqt_use_enable dbus QtDBus)
|
||||
$(usex dbus '' --no-python-dbus)
|
||||
$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
|
||||
$(usex declarative '' --no-qml-plugin)
|
||||
$(pyqt_use_enable designer)
|
||||
$(usex designer '' --no-designer-plugin)
|
||||
$(pyqt_use_enable gui)
|
||||
$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
|
||||
$(pyqt_use_enable help)
|
||||
$(pyqt_use_enable location)
|
||||
$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
|
||||
$(pyqt_use_enable network)
|
||||
$(pyqt_use_enable opengl QtOpenGL)
|
||||
$(pyqt_use_enable positioning)
|
||||
$(pyqt_use_enable printsupport QtPrintSupport)
|
||||
$(pyqt_use_enable sensors)
|
||||
$(pyqt_use_enable serialport QtSerialPort)
|
||||
$(pyqt_use_enable sql)
|
||||
$(pyqt_use_enable svg)
|
||||
$(pyqt_use_enable testlib QtTest)
|
||||
$(pyqt_use_enable webchannel QtWebChannel)
|
||||
$(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
|
||||
$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
|
||||
$(pyqt_use_enable websockets QtWebSockets)
|
||||
$(pyqt_use_enable widgets)
|
||||
$(pyqt_use_enable x11extras QtX11Extras)
|
||||
$(pyqt_use_enable xmlpatterns QtXmlPatterns)
|
||||
)
|
||||
echo "${myconf[@]}"
|
||||
"${myconf[@]}" || die
|
||||
|
||||
eqmake5 -recursive ${PN}.pro
|
||||
}
|
||||
python_foreach_impl run_in_build_dir configuration
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl run_in_build_dir default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
installation() {
|
||||
local tmp_root=${D%/}/tmp
|
||||
emake INSTALL_ROOT="${tmp_root}" install
|
||||
|
||||
local bin_dir=${tmp_root}${EPREFIX}/usr/bin
|
||||
local exe
|
||||
for exe in pylupdate5 pyrcc5 pyuic5; do
|
||||
python_doexe "${bin_dir}/${exe}"
|
||||
rm "${bin_dir}/${exe}" || die
|
||||
done
|
||||
|
||||
local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
|
||||
if python_is_python3; then
|
||||
rm -r "${uic_dir}"/port_v2 || die
|
||||
else
|
||||
rm -r "${uic_dir}"/port_v3 || die
|
||||
fi
|
||||
|
||||
multibuild_merge_root "${tmp_root}" "${D}"
|
||||
python_optimize
|
||||
}
|
||||
python_foreach_impl run_in_build_dir installation
|
||||
|
||||
einstalldocs
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
||||
@ -1 +1 @@
|
||||
DIST matplotlib2tikz-0.6.11.tar.gz 524298 SHA256 79c9f141fd802fe5863d2eaff6c67476d02ca474433e65990c935241a2591994 SHA512 eda5042f1db35436ca56256cb858fa11b48d497f621183475d69381b0b10ac67f9447522e1b78c1a331337e34eb159b5ffeef9655a8c0dc4ccab22b7afcb5e96 WHIRLPOOL b09025b9444e0a0ec122fbb7d6d90e32e043c3a86e8b7454ac3fdc0ba03374f5648491a4564bae7ef622a536f4ec92e762a68816d64621da6df44fea2c404c8c
|
||||
DIST matplotlib2tikz-0.6.13.tar.gz 524735 SHA256 ce6de9226316d4b5ae3ce0d57c7cf445d219e6842bdc041820c0c39ee9af339c SHA512 f42e96ab60005b96f9327e34ff9df444e9a371334c77b0bad85343beeb20a5c4c2df5539fd0200cf306a4cfed6926f191d547bf2ed69a98c4a9f2e1c2ae0da7b WHIRLPOOL f6ff4d4d8837394e1aacc2c66686cc711b64b6d7aad95620e402b4f1494436b8d2248ce8fbb947ec9d4a93442aba1c1cf03eed9423ff19f31b98060678274785
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
Remove version checks using pipdated.
|
||||
|
||||
Patch by Marius Brehler <marbre@linux.sungazer.de>
|
||||
--- a/matplotlib2tikz/__init__.py
|
||||
+++ b/matplotlib2tikz/__init__.py
|
||||
@@ -16,7 +16,3 @@ from matplotlib2tikz.__about__ import (
|
||||
)
|
||||
|
||||
from matplotlib2tikz.save import get_tikz_code, save
|
||||
-
|
||||
-import pipdated
|
||||
-if pipdated.needs_checking(__name__):
|
||||
- print(pipdated.check(__name__, __version__))
|
||||
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -34,7 +34,6 @@ setup(
|
||||
'matplotlib >=1.4.0',
|
||||
'numpy',
|
||||
'Pillow >= 3.0.0',
|
||||
- 'pipdated',
|
||||
'six',
|
||||
],
|
||||
description='convert matplotlib figures into TikZ/PGFPlots',
|
||||
@ -0,0 +1 @@
|
||||
DIST pysha3-1.0.2.tar.gz 829192 SHA256 fe988e73f2ce6d947220624f04d467faf05f1bbdbc64b0a201296bb3af92739e SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720 WHIRLPOOL 0de14913b4c02b1c8310432f6a71ed986c6f525c7b15bb6e91d3972a84f5599b13d621b04a4007ea276089cd75d965798a84b11d378e02ab50e1b6d243b62bc0
|
||||
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>mgorny@gentoo.org</email>
|
||||
<name>Michał Górny</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>python@gentoo.org</email>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">tiran/pysha3</remote-id>
|
||||
<remote-id type="pypi">pysha3</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,22 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
|
||||
HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.python.org/pypi/pysha3"
|
||||
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="CC0-1.0 PSF-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
CPPFLAGS += -I.
|
||||
LDLIBS = -lelf -lpopt -lbeecrypt
|
||||
|
||||
all: debugedit
|
||||
|
||||
debugedit: debugedit.o hashtab.o
|
||||
|
||||
clean:
|
||||
rm -f *.o debugedit
|
||||
|
||||
.PHONY: clean
|
||||
@ -1,2 +1,3 @@
|
||||
DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 SHA256 def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 WHIRLPOOL 95caf78eaa6ead0d9a009879a2ba9a01b138760345eb38a6786ceaf0262520e1827b5e4401884cd6d3849bfa5528f45a9a5cdac5ae61e6cbd1753dec0ba0da2f
|
||||
DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 SHA256 0dcfb79274a96f1a67aa466ca468bebf00a39544517ad0d05c09595341d11e1a SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0 WHIRLPOOL bb0a295e93870364ab176eaca3d07e18567148e5ba431a205085220b305b5cd78c210bea8896611bd4b9b47a71a527afc55a9a30a64b707993c576466609ee8a
|
||||
DIST kbuild-0.1.9998_pre20171020-src.tar.xz 2190856 SHA256 96b031b183ffb63cbbf77b1c68325868c1064d377c799ffcab0cdfb61d01aea7 SHA512 53c55a520f3711d1141b10eaeb3bec5dc57bb8476c6b658826e05dbb525eda43a0007dd94dcdde31ea39ad0bb29223ef8ad2a72da1404e53919e444039794043 WHIRLPOOL 86ce166505191eca0a83a238d61c6d2935fc43bd6d6a93c0b0dcec529a797d8a9589be4bf9498934bf7b6b80dcbfe5cf4193cd2969bf1fff5bc41209a51e5af0
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
|
||||
+++ kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
|
||||
@@ -57,7 +57,7 @@
|
||||
ifneq ($(KBUILD_TARGET),os2)
|
||||
TEMPLATE_BIN-KMK_INCS += glob
|
||||
endif
|
||||
-TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
|
||||
+TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
|
||||
ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
|
||||
ifeq ($(KBUILD_TARGET),win)
|
||||
TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
|
||||
@ -1,12 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>dlan@gentoo.org</email>
|
||||
<name>Yixun Lan</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>dlan@gentoo.org</email>
|
||||
<name>Yixun Lan</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="FlightGear data files"
|
||||
HOMEPAGE="http://www.flightgear.org/"
|
||||
SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
# data files split to separate package since 2.10.0
|
||||
RDEPEND="
|
||||
!<games-simulation/flightgear-2.10.0
|
||||
"
|
||||
|
||||
S=${WORKDIR}/fgdata
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/flightgear
|
||||
rm -fr .git
|
||||
doins -r *
|
||||
}
|
||||
@ -0,0 +1,144 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils bash-completion-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Open Source Flight Simulator"
|
||||
HOMEPAGE="http://www.flightgear.org/"
|
||||
SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0"
|
||||
IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
|
||||
|
||||
# zlib is some strange auto-dep from simgear
|
||||
COMMON_DEPEND="
|
||||
dev-db/sqlite:3
|
||||
>=dev-games/openscenegraph-3.2.0[png]
|
||||
~dev-games/simgear-${PV}[gdal=]
|
||||
media-libs/openal
|
||||
>=media-libs/speex-1.2.0:0
|
||||
media-libs/speexdsp:0
|
||||
media-sound/gsm
|
||||
sys-libs/zlib
|
||||
virtual/glu
|
||||
x11-libs/libX11
|
||||
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
|
||||
gdal? ( >=sci-libs/gdal-2.0.0:0 )
|
||||
qt5? (
|
||||
>=dev-qt/qtcore-5.4.1:5
|
||||
>=dev-qt/qtdeclarative-5.4.1:5
|
||||
>=dev-qt/qtgui-5.4.1:5
|
||||
>=dev-qt/qtnetwork-5.4.1:5
|
||||
>=dev-qt/qtwidgets-5.4.1:5
|
||||
)
|
||||
udev? ( virtual/udev )
|
||||
utils? (
|
||||
media-libs/freeglut
|
||||
media-libs/freetype:2
|
||||
media-libs/glew:0
|
||||
media-libs/libpng:0
|
||||
virtual/opengl
|
||||
qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
|
||||
)
|
||||
"
|
||||
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/boost-1.44
|
||||
>=media-libs/plib-1.8.5
|
||||
utils? (
|
||||
x11-libs/libXi
|
||||
x11-libs/libXmu
|
||||
)
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
~games-simulation/${PN}-data-${PV}
|
||||
"
|
||||
|
||||
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
|
||||
|
||||
pkg_pretend() {
|
||||
use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
|
||||
-DENABLE_FGCOM=$(usex utils)
|
||||
-DENABLE_FGELEV=$(usex utils)
|
||||
-DENABLE_FGJS=$(usex utils)
|
||||
-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
|
||||
-DENABLE_FGVIEWER=$(usex utils)
|
||||
-DENABLE_FLITE=OFF
|
||||
-DENABLE_GDAL=$(usex gdal)
|
||||
-DENABLE_GPSSMOOTH=$(usex utils)
|
||||
-DENABLE_JS_DEMO=$(usex utils)
|
||||
-DENABLE_JSBSIM=ON
|
||||
-DENABLE_LARCSIM=ON
|
||||
-DENABLE_LOGGING=$(usex test)
|
||||
-DENABLE_METAR=$(usex utils)
|
||||
-DENABLE_OPENMP=$(usex openmp)
|
||||
-DENABLE_PROFILE=OFF
|
||||
-DENABLE_QT=$(usex qt5)
|
||||
-DENABLE_RTI=OFF
|
||||
-DENABLE_TERRASYNC=$(usex utils)
|
||||
-DENABLE_TESTS=$(usex test)
|
||||
-DENABLE_TRAFFIC=$(usex utils)
|
||||
-DENABLE_UIUC_MODEL=ON
|
||||
-DENABLE_YASIM=ON
|
||||
-DEVENT_INPUT=$(usex udev)
|
||||
-DFG_BUILD_TYPE=Release
|
||||
-DFG_DATA_DIR=/usr/share/${PN}
|
||||
-DJSBSIM_TERRAIN=ON
|
||||
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
|
||||
-DSP_FDMS=ON
|
||||
-DSYSTEM_FLITE=ON
|
||||
-DSYSTEM_HTS_ENGINE=ON
|
||||
-DSYSTEM_SPEEX=ON
|
||||
-DSYSTEM_GSM=ON
|
||||
-DSYSTEM_SQLITE=ON
|
||||
-DUSE_AEONWAVE=OFF
|
||||
-DUSE_DBUS=$(usex dbus)
|
||||
-DWITH_FGPANEL=$(usex utils)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# Install bash completion (TODO zsh)
|
||||
# Uncomment below when scripts stops writing files...
|
||||
# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
|
||||
# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
|
||||
# newbashcomp scripts/completion/fg-completion.bash ${PN}
|
||||
|
||||
# Install examples and other misc files
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/"${PF}"/examples
|
||||
doins -r scripts/java scripts/perl scripts/python
|
||||
insinto /usr/share/doc/"${PF}"/examples/c++
|
||||
doins -r scripts/example/*
|
||||
insinto /usr/share/doc/"${PF}"/tools
|
||||
doins -r scripts/atis scripts/tools/*
|
||||
fi
|
||||
|
||||
# Install nasal script syntax
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins scripts/syntax/{ac3d,nasal}.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect/
|
||||
doins "${FILESDIR}"/{ac3d,nasal}.vim
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Please note that data files location changed to /usr/share/flightgear"
|
||||
if use qt5; then
|
||||
einfo "To use launcher, run fgfs with '--launcher' parameter"
|
||||
fi
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue