root
9 years ago
parent
3d2aec4b91
commit
926e7bf096
@ -1 +1,2 @@
|
||||
DIST cdw-0.7.1.tar.gz 771099 SHA256 6364c2b836bfe4bf3a672eee1eda2a32061e31d94f73abb02cd5f3e1b69a744e SHA512 8577281841ec3638157473004c835b17167e751594cf19a8960ab37bcad58179abbaa49da9ce37f841adbb79e0e75488d780dbfe348241b1f83a084a88dde205 WHIRLPOOL 58fdfd4e7375b3022a34e2ab6afc14625d3e7e24538069b0c6fd90ed645ba79d8d167d96c42204a1732095ebe8ea4b16d8e4321355cddd2d7a1fb8766ed3f806
|
||||
DIST cdw-0.8.0.tar.gz 849851 SHA256 8f5bd7ed41bc07a84c5aa693bed3c38420e60ba6a3b5ae6ff8e41d78a4665fd2 SHA512 67fd9e397800187baafff425fd77ae9ba679a7b396736004f305accea3c3c9ca215d70dac0410fd8ef9ed016f7ce11c3859c84bfa04e3234cee84201605175d0 WHIRLPOOL 1ad447f47bb8d1fdd5868aa0c6a5bba2f76d65aa93a7be6841823215794c094a25f8e03be6573b3d46256ad33e8d20185e5f790b3f1b5320623b74fd7a2eef6c
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-0.8.0.ebuild,v 1.2 2015/02/19 09:59:26 mr_bones_ Exp $
|
||||
|
||||
EAPI=5
|
||||
DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
|
||||
HOMEPAGE="http://cdw.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="virtual/cdrtools
|
||||
app-cdr/dvd+rw-tools
|
||||
dev-libs/libburn
|
||||
dev-libs/libcdio[-minimal]
|
||||
sys-libs/ncurses[unicode]"
|
||||
|
||||
src_install() {
|
||||
DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
|
||||
default
|
||||
}
|
||||
@ -0,0 +1,499 @@
|
||||
Created by: Karl Hakimian
|
||||
Added by: Jesus Rivero <neurogeek@gentoo.org>
|
||||
Added on: Feb 18, 2015
|
||||
diff -rupN nvi-1.81.6.orig/common/api.c nvi-1.81.6/common/api.c
|
||||
--- nvi-1.81.6.orig/common/api.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/common/api.c 2015-02-17 11:04:50.199111784 -0800
|
||||
@@ -423,7 +423,7 @@ api_opts_get(SCR *sp, CHAR_T *name, char
|
||||
switch (op->type) {
|
||||
case OPT_0BOOL:
|
||||
case OPT_1BOOL:
|
||||
- MALLOC_RET(sp, *value, char *, STRLEN(op->name) + 2 + 1);
|
||||
+ MALLOC_RET(sp, *value, char *, NVI_STRLEN(op->name) + 2 + 1);
|
||||
(void)sprintf(*value,
|
||||
"%s"WS, O_ISSET(sp, offset) ? "" : "no", op->name);
|
||||
if (boolvalue != NULL)
|
||||
diff -rupN nvi-1.81.6.orig/common/msg.c nvi-1.81.6/common/msg.c
|
||||
--- nvi-1.81.6.orig/common/msg.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/common/msg.c 2015-02-17 11:04:50.203891722 -0800
|
||||
@@ -378,7 +378,7 @@ msgq_wstr(SCR *sp, mtype_t mtype, CHAR_T
|
||||
msgq(sp, mtype, fmt);
|
||||
return;
|
||||
}
|
||||
- INT2CHAR(sp, str, STRLEN(str) + 1, nstr, nlen);
|
||||
+ INT2CHAR(sp, str, NVI_STRLEN(str) + 1, nstr, nlen);
|
||||
msgq_str(sp, mtype, nstr, fmt);
|
||||
}
|
||||
|
||||
diff -rupN nvi-1.81.6.orig/common/multibyte.h nvi-1.81.6/common/multibyte.h
|
||||
--- nvi-1.81.6.orig/common/multibyte.h 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/common/multibyte.h 2015-02-17 11:04:50.204262910 -0800
|
||||
@@ -12,7 +12,7 @@ typedef wchar_t CHAR_T;
|
||||
typedef u_int UCHAR_T;
|
||||
#define RCHAR_BIT 24
|
||||
|
||||
-#define STRLEN wcslen
|
||||
+#define NVI_STRLEN wcslen
|
||||
#define STRTOL wcstol
|
||||
#define STRTOUL wcstoul
|
||||
#define SPRINTF swprintf
|
||||
@@ -31,7 +31,7 @@ typedef u_char CHAR_T;
|
||||
typedef u_char UCHAR_T;
|
||||
#define RCHAR_BIT CHAR_BIT
|
||||
|
||||
-#define STRLEN strlen
|
||||
+#define NVI_STRLEN strlen
|
||||
#define STRTOL strtol
|
||||
#define STRTOUL strtoul
|
||||
#define SPRINTF snprintf
|
||||
diff -rupN nvi-1.81.6.orig/common/options.c nvi-1.81.6/common/options.c
|
||||
--- nvi-1.81.6.orig/common/options.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/common/options.c 2015-02-17 11:04:50.195900457 -0800
|
||||
@@ -315,7 +315,7 @@ opts_init(SCR *sp, int *oargs)
|
||||
|
||||
/* Set numeric and string default values. */
|
||||
#define OI(indx, str) { \
|
||||
- a.len = STRLEN(str); \
|
||||
+ a.len = NVI_STRLEN(str); \
|
||||
if ((CHAR_T*)str != b2) /* GCC puts strings in text-space. */ \
|
||||
(void)MEMCPY(b2, str, a.len+1); \
|
||||
if (opts_set(sp, argv, NULL)) { \
|
||||
@@ -620,10 +620,10 @@ opts_set(SCR *sp, ARGS **argv, char *usa
|
||||
goto badnum;
|
||||
if ((nret =
|
||||
nget_uslong(sp, &value, sep, &endp, 10)) != NUM_OK) {
|
||||
- INT2CHAR(sp, name, STRLEN(name) + 1,
|
||||
+ INT2CHAR(sp, name, NVI_STRLEN(name) + 1,
|
||||
np, nlen);
|
||||
p2 = msg_print(sp, np, &nf);
|
||||
- INT2CHAR(sp, sep, STRLEN(sep) + 1,
|
||||
+ INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1,
|
||||
np, nlen);
|
||||
t2 = msg_print(sp, np, &nf2);
|
||||
switch (nret) {
|
||||
@@ -647,10 +647,10 @@ opts_set(SCR *sp, ARGS **argv, char *usa
|
||||
break;
|
||||
}
|
||||
if (*endp && !ISBLANK(*endp)) {
|
||||
-badnum: INT2CHAR(sp, name, STRLEN(name) + 1,
|
||||
+badnum: INT2CHAR(sp, name, NVI_STRLEN(name) + 1,
|
||||
np, nlen);
|
||||
p2 = msg_print(sp, np, &nf);
|
||||
- INT2CHAR(sp, sep, STRLEN(sep) + 1,
|
||||
+ INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1,
|
||||
np, nlen);
|
||||
t2 = msg_print(sp, np, &nf2);
|
||||
msgq(sp, M_ERR,
|
||||
@@ -680,7 +680,7 @@ badnum: INT2CHAR(sp, name, STRLEN(nam
|
||||
break;
|
||||
|
||||
/* Report to subsystems. */
|
||||
- INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, np, nlen);
|
||||
if (op->func != NULL &&
|
||||
op->func(sp, spo, np, &value) ||
|
||||
ex_optchange(sp, offset, np, &value) ||
|
||||
@@ -712,7 +712,7 @@ badnum: INT2CHAR(sp, name, STRLEN(nam
|
||||
* Do nothing if the value is unchanged, the underlying
|
||||
* functions can be expensive.
|
||||
*/
|
||||
- INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, sep, NVI_STRLEN(sep) + 1, np, nlen);
|
||||
if (!F_ISSET(op, OPT_ALWAYS) &&
|
||||
O_STR(sp, offset) != NULL &&
|
||||
!strcmp(O_STR(sp, offset), np))
|
||||
@@ -879,7 +879,7 @@ opts_dump(SCR *sp, enum optdisp type)
|
||||
}
|
||||
F_CLR(&sp->opts[cnt], OPT_SELECTED);
|
||||
|
||||
- curlen = STRLEN(op->name);
|
||||
+ curlen = NVI_STRLEN(op->name);
|
||||
switch (op->type) {
|
||||
case OPT_0BOOL:
|
||||
case OPT_1BOOL:
|
||||
@@ -1049,7 +1049,7 @@ opts_search(CHAR_T *name)
|
||||
* Check to see if the name is the prefix of one (and only one)
|
||||
* option. If so, return the option.
|
||||
*/
|
||||
- len = STRLEN(name);
|
||||
+ len = NVI_STRLEN(name);
|
||||
for (found = NULL, op = optlist; op->name != NULL; ++op) {
|
||||
if (op->name[0] < name[0])
|
||||
continue;
|
||||
diff -rupN nvi-1.81.6.orig/dist/tags nvi-1.81.6/dist/tags
|
||||
--- nvi-1.81.6.orig/dist/tags 2007-11-18 08:43:55.000000000 -0800
|
||||
+++ nvi-1.81.6/dist/tags 2015-02-17 11:04:50.225314084 -0800
|
||||
@@ -1068,8 +1068,8 @@ SPRINTF ../common/multibyte.h 37;" d
|
||||
STANDARD_TAB ../common/key.h 213;" d
|
||||
STRCMP ../common/multibyte.h 19;" d
|
||||
STRCMP ../common/multibyte.h 38;" d
|
||||
-STRLEN ../common/multibyte.h 15;" d
|
||||
-STRLEN ../common/multibyte.h 34;" d
|
||||
+NVI_STRLEN ../common/multibyte.h 15;" d
|
||||
+NVI_STRLEN ../common/multibyte.h 34;" d
|
||||
STRPBRK ../common/multibyte.h 20;" d
|
||||
STRPBRK ../common/multibyte.h 39;" d
|
||||
STRSET ../common/multibyte.h 22;" d
|
||||
diff -rupN nvi-1.81.6.orig/ex/ex_argv.c nvi-1.81.6/ex/ex_argv.c
|
||||
--- nvi-1.81.6.orig/ex/ex_argv.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/ex/ex_argv.c 2015-02-17 11:04:50.267171388 -0800
|
||||
@@ -217,7 +217,7 @@ argv_exp2(SCR *sp, EXCMD *excp, CHAR_T *
|
||||
|
||||
*p = '\0';
|
||||
INT2CHAR(sp, bp + SHELLOFFSET,
|
||||
- STRLEN(bp + SHELLOFFSET) + 1, np, nlen);
|
||||
+ NVI_STRLEN(bp + SHELLOFFSET) + 1, np, nlen);
|
||||
d = strdup(np);
|
||||
rval = argv_lexp(sp, excp, d);
|
||||
free (d);
|
||||
@@ -332,7 +332,7 @@ argv_fexp(SCR *sp, EXCMD *excp, CHAR_T *
|
||||
"115|No previous command to replace \"!\"");
|
||||
return (1);
|
||||
}
|
||||
- len += tlen = STRLEN(exp->lastbcomm);
|
||||
+ len += tlen = NVI_STRLEN(exp->lastbcomm);
|
||||
off = p - bp;
|
||||
ADD_SPACE_RETW(sp, bp, blen, len);
|
||||
p = bp + off;
|
||||
@@ -683,7 +683,7 @@ err: if (ifp != NULL)
|
||||
* XXX
|
||||
* Assume that all shells have -c.
|
||||
*/
|
||||
- INT2CHAR(sp, bp, STRLEN(bp)+1, np, nlen);
|
||||
+ INT2CHAR(sp, bp, NVI_STRLEN(bp)+1, np, nlen);
|
||||
execl(sh_path, sh, "-c", np, (char *)NULL);
|
||||
msgq_str(sp, M_SYSERR, sh_path, "118|Error: execl: %s");
|
||||
_exit(127);
|
||||
diff -rupN nvi-1.81.6.orig/ex/ex_cscope.c nvi-1.81.6/ex/ex_cscope.c
|
||||
--- nvi-1.81.6.orig/ex/ex_cscope.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/ex/ex_cscope.c 2015-02-17 11:04:50.261539058 -0800
|
||||
@@ -140,7 +140,7 @@ ex_cscope(SCR *sp, EXCMD *cmdp)
|
||||
for (; *p && isspace(*p); ++p);
|
||||
}
|
||||
|
||||
- INT2CHAR(sp, cmd, STRLEN(cmd) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, cmd, NVI_STRLEN(cmd) + 1, np, nlen);
|
||||
if ((ccp = lookup_ccmd(np)) == NULL) {
|
||||
usage: msgq(sp, M_ERR, "309|Use \"cscope help\" for help");
|
||||
return (1);
|
||||
@@ -214,7 +214,7 @@ cscope_add(SCR *sp, EXCMD *cmdp, CHAR_T
|
||||
* >1 additional args: object, too many args.
|
||||
*/
|
||||
cur_argc = cmdp->argc;
|
||||
- if (argv_exp2(sp, cmdp, dname, STRLEN(dname))) {
|
||||
+ if (argv_exp2(sp, cmdp, dname, NVI_STRLEN(dname))) {
|
||||
return (1);
|
||||
}
|
||||
if (cmdp->argc == cur_argc) {
|
||||
@@ -228,7 +228,7 @@ cscope_add(SCR *sp, EXCMD *cmdp, CHAR_T
|
||||
return (1);
|
||||
}
|
||||
|
||||
- INT2CHAR(sp, dname, STRLEN(dname)+1, np, nlen);
|
||||
+ INT2CHAR(sp, dname, NVI_STRLEN(dname)+1, np, nlen);
|
||||
|
||||
/*
|
||||
* The user can specify a specific file (so they can have multiple
|
||||
@@ -471,7 +471,7 @@ cscope_find(SCR *sp, EXCMD *cmdp, CHAR_T
|
||||
}
|
||||
|
||||
/* Create the cscope command. */
|
||||
- INT2CHAR(sp, pattern, STRLEN(pattern) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, pattern, NVI_STRLEN(pattern) + 1, np, nlen);
|
||||
np = strdup(np);
|
||||
if ((tqp = create_cs_cmd(sp, np, &search)) == NULL)
|
||||
goto err;
|
||||
@@ -801,7 +801,7 @@ cscope_help(SCR *sp, EXCMD *cmdp, CHAR_T
|
||||
char *np;
|
||||
size_t nlen;
|
||||
|
||||
- INT2CHAR(sp, subcmd, STRLEN(subcmd) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, subcmd, NVI_STRLEN(subcmd) + 1, np, nlen);
|
||||
return (csc_help(sp, np));
|
||||
}
|
||||
|
||||
@@ -842,7 +842,7 @@ cscope_kill(SCR *sp, EXCMD *cmdp, CHAR_T
|
||||
char *np;
|
||||
size_t nlen;
|
||||
|
||||
- INT2CHAR(sp, cn, STRLEN(cn) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, cn, NVI_STRLEN(cn) + 1, np, nlen);
|
||||
return (terminate(sp, NULL, atoi(np)));
|
||||
}
|
||||
|
||||
diff -rupN nvi-1.81.6.orig/ex/ex_filter.c nvi-1.81.6/ex/ex_filter.c
|
||||
--- nvi-1.81.6.orig/ex/ex_filter.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/ex/ex_filter.c 2015-02-17 11:04:50.263257613 -0800
|
||||
@@ -138,7 +138,7 @@ err: if (input[0] != -1)
|
||||
else
|
||||
++name;
|
||||
|
||||
- INT2SYS(sp, cmd, STRLEN(cmd)+1, np, nlen);
|
||||
+ INT2SYS(sp, cmd, NVI_STRLEN(cmd)+1, np, nlen);
|
||||
execl(O_STR(sp, O_SHELL), name, "-c", np, (char *)NULL);
|
||||
msgq_str(sp, M_SYSERR, O_STR(sp, O_SHELL), "execl: %s");
|
||||
_exit (127);
|
||||
@@ -283,7 +283,7 @@ err: if (input[0] != -1)
|
||||
* Ignore errors on vi file reads, to make reads prettier. It's
|
||||
* completely inconsistent, and historic practice.
|
||||
*/
|
||||
-uwait: INT2CHAR(sp, cmd, STRLEN(cmd) + 1, np, nlen);
|
||||
+uwait: INT2CHAR(sp, cmd, NVI_STRLEN(cmd) + 1, np, nlen);
|
||||
return (proc_wait(sp, (long)utility_pid, np,
|
||||
ftype == FILTER_READ && F_ISSET(sp, SC_VI) ? 1 : 0, 0) || rval);
|
||||
}
|
||||
diff -rupN nvi-1.81.6.orig/ex/ex_init.c nvi-1.81.6/ex/ex_init.c
|
||||
--- nvi-1.81.6.orig/ex/ex_init.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/ex/ex_init.c 2015-02-17 11:04:50.279419412 -0800
|
||||
@@ -61,7 +61,7 @@ ex_screen_copy(SCR *orig, SCR *sp)
|
||||
|
||||
if (oexp->lastbcomm != NULL &&
|
||||
(nexp->lastbcomm = v_wstrdup(sp, oexp->lastbcomm,
|
||||
- STRLEN(oexp->lastbcomm))) == NULL) {
|
||||
+ NVI_STRLEN(oexp->lastbcomm))) == NULL) {
|
||||
msgq(sp, M_SYSERR, NULL);
|
||||
return(1);
|
||||
}
|
||||
diff -rupN nvi-1.81.6.orig/ex/ex_tag.c nvi-1.81.6/ex/ex_tag.c
|
||||
--- nvi-1.81.6.orig/ex/ex_tag.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/ex/ex_tag.c 2015-02-17 11:04:50.275254557 -0800
|
||||
@@ -68,7 +68,7 @@ ex_tag_first(SCR *sp, CHAR_T *tagarg)
|
||||
|
||||
/* Build an argument for the ex :tag command. */
|
||||
ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
|
||||
- argv_exp0(sp, &cmd, tagarg, STRLEN(tagarg));
|
||||
+ argv_exp0(sp, &cmd, tagarg, NVI_STRLEN(tagarg));
|
||||
|
||||
/*
|
||||
* XXX
|
||||
@@ -115,7 +115,7 @@ ex_tag_push(SCR *sp, EXCMD *cmdp)
|
||||
|
||||
/* Taglength may limit the number of characters. */
|
||||
if ((tl =
|
||||
- O_VAL(sp, O_TAGLENGTH)) != 0 && STRLEN(exp->tag_last) > tl)
|
||||
+ O_VAL(sp, O_TAGLENGTH)) != 0 && NVI_STRLEN(exp->tag_last) > tl)
|
||||
exp->tag_last[tl] = '\0';
|
||||
break;
|
||||
case 0:
|
||||
@@ -587,7 +587,7 @@ ex_tag_copy(SCR *orig, SCR *sp)
|
||||
/* Copy the last tag. */
|
||||
if (oexp->tag_last != NULL &&
|
||||
(nexp->tag_last = v_wstrdup(sp, oexp->tag_last,
|
||||
- STRLEN(oexp->tag_last))) == NULL) {
|
||||
+ NVI_STRLEN(oexp->tag_last))) == NULL) {
|
||||
msgq(sp, M_SYSERR, NULL);
|
||||
return (1);
|
||||
}
|
||||
@@ -997,7 +997,7 @@ ctag_slist(SCR *sp, CHAR_T *tag)
|
||||
exp = EXP(sp);
|
||||
|
||||
/* Allocate and initialize the tag queue structure. */
|
||||
- INT2CHAR(sp, tag, STRLEN(tag) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, tag, NVI_STRLEN(tag) + 1, np, nlen);
|
||||
len = nlen - 1;
|
||||
CALLOC_GOTO(sp, tqp, TAGQ *, 1, sizeof(TAGQ) + len + 1);
|
||||
CIRCLEQ_INIT(&tqp->tagq);
|
||||
diff -rupN nvi-1.81.6.orig/ex/ex_util.c nvi-1.81.6/ex/ex_util.c
|
||||
--- nvi-1.81.6.orig/ex/ex_util.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/ex/ex_util.c 2015-02-17 11:04:50.268378054 -0800
|
||||
@@ -153,7 +153,7 @@ ex_wemsg(SCR* sp, CHAR_T *p, exm_t which
|
||||
char *np;
|
||||
size_t nlen;
|
||||
|
||||
- if (p) INT2CHAR(sp, p, STRLEN(p), np, nlen);
|
||||
+ if (p) INT2CHAR(sp, p, NVI_STRLEN(p), np, nlen);
|
||||
else np = NULL;
|
||||
ex_emsg(sp, np, which);
|
||||
}
|
||||
diff -rupN nvi-1.81.6.orig/ex/ex_write.c nvi-1.81.6/ex/ex_write.c
|
||||
--- nvi-1.81.6.orig/ex/ex_write.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/ex/ex_write.c 2015-02-17 11:04:50.277249383 -0800
|
||||
@@ -158,7 +158,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
|
||||
ex_emsg(sp, cmdp->cmd->usage, EXM_USAGE);
|
||||
return (1);
|
||||
}
|
||||
- if (argv_exp1(sp, cmdp, p, STRLEN(p), 1))
|
||||
+ if (argv_exp1(sp, cmdp, p, NVI_STRLEN(p), 1))
|
||||
return (1);
|
||||
|
||||
/*
|
||||
@@ -203,7 +203,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
|
||||
&cmdp->addr1, &cmdp->addr2, NULL, flags));
|
||||
|
||||
/* Build an argv so we get an argument count and file expansion. */
|
||||
- if (argv_exp2(sp, cmdp, p, STRLEN(p)))
|
||||
+ if (argv_exp2(sp, cmdp, p, NVI_STRLEN(p)))
|
||||
return (1);
|
||||
|
||||
/*
|
||||
@@ -255,7 +255,7 @@ exwr(SCR *sp, EXCMD *cmdp, enum which cm
|
||||
set_alt_name(sp, name);
|
||||
break;
|
||||
default:
|
||||
- INT2CHAR(sp, p, STRLEN(p) + 1, n, nlen);
|
||||
+ INT2CHAR(sp, p, NVI_STRLEN(p) + 1, n, nlen);
|
||||
ex_emsg(sp, n, EXM_FILECOUNT);
|
||||
return (1);
|
||||
}
|
||||
diff -rupN nvi-1.81.6.orig/ip/ip_term.c nvi-1.81.6/ip/ip_term.c
|
||||
--- nvi-1.81.6.orig/ip/ip_term.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/ip/ip_term.c 2015-02-17 11:04:50.280203225 -0800
|
||||
@@ -127,7 +127,7 @@ ip_optchange(SCR *sp, int offset, char *
|
||||
|
||||
ipb.code = SI_EDITOPT;
|
||||
ipb.str1 = (char*)opt->name;
|
||||
- ipb.len1 = STRLEN(opt->name) * sizeof(CHAR_T);
|
||||
+ ipb.len1 = NVI_STRLEN(opt->name) * sizeof(CHAR_T);
|
||||
|
||||
(void)vi_send(ipp->o_fd, "ab1", &ipb);
|
||||
return (0);
|
||||
diff -rupN nvi-1.81.6.orig/perl_api/perl.xs nvi-1.81.6/perl_api/perl.xs
|
||||
--- nvi-1.81.6.orig/perl_api/perl.xs 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/perl_api/perl.xs 2015-02-17 11:04:50.189684363 -0800
|
||||
@@ -326,7 +326,7 @@ perl_ex_perl(scrp, cmdp, cmdlen, f_lno,
|
||||
newVIrv(pp->svid, scrp);
|
||||
|
||||
istat = signal(SIGINT, my_sighandler);
|
||||
- INT2CHAR(scrp, cmdp, STRLEN(cmdp)+1, np, nlen);
|
||||
+ INT2CHAR(scrp, cmdp, NVI_STRLEN(cmdp)+1, np, nlen);
|
||||
perl_eval(np);
|
||||
signal(SIGINT, istat);
|
||||
|
||||
@@ -421,7 +421,7 @@ perl_ex_perldo(scrp, cmdp, cmdlen, f_lno
|
||||
/* Backwards compatibility. */
|
||||
newVIrv(pp->svid, scrp);
|
||||
|
||||
- INT2CHAR(scrp, cmdp, STRLEN(cmdp)+1, np, nlen);
|
||||
+ INT2CHAR(scrp, cmdp, NVI_STRLEN(cmdp)+1, np, nlen);
|
||||
if (!(command = malloc(length = nlen - 1 + sizeof("sub {}"))))
|
||||
return 1;
|
||||
snprintf(command, length, "sub {%s}", np);
|
||||
diff -rupN nvi-1.81.6.orig/regex/engine.c nvi-1.81.6/regex/engine.c
|
||||
--- nvi-1.81.6.orig/regex/engine.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/regex/engine.c 2015-02-17 11:04:50.181456859 -0800
|
||||
@@ -161,7 +161,7 @@ int eflags;
|
||||
stop = string + pmatch[0].rm_eo;
|
||||
} else {
|
||||
start = string;
|
||||
- stop = start + STRLEN(start);
|
||||
+ stop = start + NVI_STRLEN(start);
|
||||
}
|
||||
if (stop < start)
|
||||
return(REG_INVARG);
|
||||
diff -rupN nvi-1.81.6.orig/regex/regcomp.c nvi-1.81.6/regex/regcomp.c
|
||||
--- nvi-1.81.6.orig/regex/regcomp.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/regex/regcomp.c 2015-02-17 11:04:50.175705539 -0800
|
||||
@@ -198,7 +198,7 @@ regcomp(regex_t *preg, const RCHAR_T *pa
|
||||
return(REG_INVARG);
|
||||
len = preg->re_endp - pattern;
|
||||
} else
|
||||
- len = STRLEN(pattern);
|
||||
+ len = NVI_STRLEN(pattern);
|
||||
|
||||
/* do the mallocs early so failure handling is easy */
|
||||
g = (struct re_guts *)malloc(sizeof(struct re_guts) +
|
||||
@@ -818,7 +818,7 @@ p_b_cclass(register struct parse *p, reg
|
||||
NEXT();
|
||||
len = p->next - sp;
|
||||
for (cp = cclasses; cp->name != NULL; cp++)
|
||||
- if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
|
||||
+ if (NVI_STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
|
||||
break;
|
||||
if (cp->name == NULL) {
|
||||
/* oops, didn't find it */
|
||||
@@ -889,7 +889,7 @@ p_b_coll_elem(register struct parse *p,
|
||||
}
|
||||
len = p->next - sp;
|
||||
for (cp = cnames; cp->name != NULL; cp++)
|
||||
- if (STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
|
||||
+ if (NVI_STRLEN(cp->name) == len && MEMCMP(cp->name, sp, len))
|
||||
return(cp->code); /* known name */
|
||||
if (len == 1)
|
||||
return(*sp); /* single character */
|
||||
diff -rupN nvi-1.81.6.orig/vi/v_event.c nvi-1.81.6/vi/v_event.c
|
||||
--- nvi-1.81.6.orig/vi/v_event.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/vi/v_event.c 2015-02-17 11:04:50.242966563 -0800
|
||||
@@ -97,7 +97,7 @@ v_editopt(SCR *sp, VICMD *vp)
|
||||
size_t nlen;
|
||||
char *p2;
|
||||
|
||||
- INT2CHAR(sp, vp->ev.e_str2, STRLEN(vp->ev.e_str2)+1, np, nlen);
|
||||
+ INT2CHAR(sp, vp->ev.e_str2, NVI_STRLEN(vp->ev.e_str2)+1, np, nlen);
|
||||
p2 = strdup(np);
|
||||
rval = api_opts_set(sp, vp->ev.e_str1, p2,
|
||||
vp->ev.e_val1, vp->ev.e_val1);
|
||||
@@ -135,7 +135,7 @@ v_tag(SCR *sp, VICMD *vp)
|
||||
return (1);
|
||||
|
||||
ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
|
||||
- argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw));
|
||||
+ argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw));
|
||||
return (v_exec_ex(sp, vp, &cmd));
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ v_tagsplit(SCR *sp, VICMD *vp)
|
||||
|
||||
ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, OOBLNO, 0);
|
||||
F_SET(&cmd, E_NEWSCREEN);
|
||||
- argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw));
|
||||
+ argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw));
|
||||
return (v_exec_ex(sp, vp, &cmd));
|
||||
}
|
||||
|
||||
diff -rupN nvi-1.81.6.orig/vi/v_ex.c nvi-1.81.6/vi/v_ex.c
|
||||
--- nvi-1.81.6.orig/vi/v_ex.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/vi/v_ex.c 2015-02-17 11:04:50.246380280 -0800
|
||||
@@ -210,7 +210,7 @@ v_tagpush(SCR *sp, VICMD *vp)
|
||||
EXCMD cmd;
|
||||
|
||||
ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, 0, 0);
|
||||
- argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw) + 1);
|
||||
+ argv_exp0(sp, &cmd, VIP(sp)->keyw, NVI_STRLEN(VIP(sp)->keyw) + 1);
|
||||
return (v_exec_ex(sp, vp, &cmd));
|
||||
}
|
||||
|
||||
diff -rupN nvi-1.81.6.orig/vi/vs_msg.c nvi-1.81.6/vi/vs_msg.c
|
||||
--- nvi-1.81.6.orig/vi/vs_msg.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/vi/vs_msg.c 2015-02-17 11:04:50.251093618 -0800
|
||||
@@ -175,7 +175,7 @@ vs_update(SCR *sp, const char *m1, const
|
||||
*/
|
||||
if (F_ISSET(sp, SC_SCR_EXWROTE)) {
|
||||
if (m2 != NULL)
|
||||
- INT2CHAR(sp, m2, STRLEN(m2) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, m2, NVI_STRLEN(m2) + 1, np, nlen);
|
||||
(void)ex_printf(sp,
|
||||
"%s\n", m1 == NULL? "" : m1, m2 == NULL ? "" : np);
|
||||
(void)ex_fflush(sp);
|
||||
@@ -203,7 +203,7 @@ vs_update(SCR *sp, const char *m1, const
|
||||
} else
|
||||
len = 0;
|
||||
if (m2 != NULL) {
|
||||
- mlen = STRLEN(m2);
|
||||
+ mlen = NVI_STRLEN(m2);
|
||||
if (len + mlen > sp->cols - 2)
|
||||
mlen = (sp->cols - 2) - len;
|
||||
(void)gp->scr_waddstr(sp, m2, mlen);
|
||||
diff -rupN nvi-1.81.6.orig/vi/vs_split.c nvi-1.81.6/vi/vs_split.c
|
||||
--- nvi-1.81.6.orig/vi/vs_split.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/vi/vs_split.c 2015-02-17 11:04:50.256136584 -0800
|
||||
@@ -628,7 +628,7 @@ vs_fg(SCR *sp, SCR **nspp, CHAR_T *name,
|
||||
wp = sp->wp;
|
||||
|
||||
if (name)
|
||||
- INT2CHAR(sp, name, STRLEN(name) + 1, np, nlen);
|
||||
+ INT2CHAR(sp, name, NVI_STRLEN(name) + 1, np, nlen);
|
||||
else
|
||||
np = NULL;
|
||||
if (newscreen)
|
||||
diff -rupN nvi-1.81.6.orig/vi/v_txt.c nvi-1.81.6/vi/v_txt.c
|
||||
--- nvi-1.81.6.orig/vi/v_txt.c 2007-11-18 08:41:42.000000000 -0800
|
||||
+++ nvi-1.81.6/vi/v_txt.c 2015-02-17 11:04:50.240596567 -0800
|
||||
@@ -2049,7 +2049,7 @@ retry: for (len = 0,
|
||||
return (0);
|
||||
case 1: /* One match. */
|
||||
/* If something changed, do the exchange. */
|
||||
- nlen = STRLEN(cmd.argv[0]->bp);
|
||||
+ nlen = NVI_STRLEN(cmd.argv[0]->bp);
|
||||
if (len != nlen || MEMCMP(cmd.argv[0]->bp, p, len))
|
||||
break;
|
||||
|
||||
@ -0,0 +1,102 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r5.ebuild,v 1.1 2015/02/19 02:45:24 neurogeek Exp $
|
||||
|
||||
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 ) )"
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
app-admin/eselect-vi"
|
||||
|
||||
REQUIRED_USE="tcl? ( !unicode )"
|
||||
|
||||
src_prepare() {
|
||||
|
||||
epatch "${FILESDIR}"/${P}-strlen-macro-renaming.patch
|
||||
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,3 +1 @@
|
||||
DIST docker-1.3.3.tar.gz 5886211 SHA256 9c054e438eee94e7028e860fcb2356a0983e98522223089902d0c61f505dbbcb SHA512 d0f928c1edfcd6d3e11893c2c41da430041fcbe53217e1abc978b379e5464c41204de97da9d5e3e06c1337f4e5b79e1ae98f734d62d64962b3f8b6c37c9bdb85 WHIRLPOOL 2fd4ae184d04f21c62a7e7157f81fe9484ce05cc019c184acc9bcc23db7ba2a866930c6bdcb69f2981a0c394e61e6c996a847bcd8102657a82806fdec2aed29d
|
||||
DIST docker-1.4.1.tar.gz 6054386 SHA256 34300e214e5d2f1633d9650be16bce86d635d72596faa575912fecefda612835 SHA512 e83bbc5443c42836768e71ba4a7f1aea0ba062439c85fef12bff3e812eb3c93b47bd455f36abbcf5a332c293f3274f7a00b3909ec4b919eff449aa52557997b3 WHIRLPOOL e85143c7182186819299ef517512ad9ac5101568bb5fcd016939a4ecb6803c2fd28c474502c07a257bb961bbb10316ec80306cdf038c13435855b58857cc70b1
|
||||
DIST docker-1.5.0.tar.gz 6459415 SHA256 cf97a1b3a75a63d3b7cb743b5376a1b1bc00eac651dce9e3f094202901a43c48 SHA512 cc620570c67454bedfae73de86b722a845fce4b0bd46446d1190ae98917010db54fbf82951167ebf62358e53dedb45fff2a7f25014c79b42efc2a5f2b611b4d9 WHIRLPOOL acb62b6c1b354212cf250b60227c5dbedc7fe6c6e729fc887653b776a991cd13650c643e20abf06a4326412cb10a1b4e2a20bac0a1fbc056b8d2cf2d54d1fcd0
|
||||
|
||||
@ -1,234 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.3.3-r1.ebuild,v 1.2 2015/02/15 02:08:25 patrick Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
|
||||
HOMEPAGE="https://www.docker.com"
|
||||
|
||||
GITHUB_URI="github.com/docker/docker"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
SRC_URI=""
|
||||
EGIT_REPO_URI="git://${GITHUB_URI}.git"
|
||||
inherit git-2
|
||||
else
|
||||
SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
DOCKER_GITCOMMIT="d344625"
|
||||
KEYWORDS="~amd64"
|
||||
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 linux-info multilib systemd udev user
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion"
|
||||
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
|
||||
CDEPEND="
|
||||
>=dev-db/sqlite-3.7.9:3
|
||||
device-mapper? (
|
||||
>=sys-fs/lvm2-2.02.89[thin]
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
>=dev-lang/go-1.3
|
||||
<dev-lang/go-1.4
|
||||
btrfs? (
|
||||
>=sys-fs/btrfs-progs-3.16.1
|
||||
)
|
||||
"
|
||||
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
|
||||
!app-emulation/docker-bin
|
||||
>=net-firewall/iptables-1.4
|
||||
sys-process/procps
|
||||
>=dev-vcs/git-1.7
|
||||
>=app-arch/xz-utils-4.9
|
||||
|
||||
lxc? (
|
||||
>=app-emulation/lxc-1.0
|
||||
)
|
||||
aufs? (
|
||||
|| (
|
||||
sys-fs/aufs3
|
||||
sys-kernel/aufs-sources
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
RESTRICT="installsources strip"
|
||||
|
||||
# see "contrib/check-config.sh" from upstream's sources
|
||||
CONFIG_CHECK="
|
||||
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
|
||||
~DEVPTS_MULTIPLE_INSTANCES
|
||||
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED
|
||||
~MACVLAN ~VETH ~BRIDGE
|
||||
~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
|
||||
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
|
||||
~NF_NAT NF_NAT_NEEDED
|
||||
|
||||
~MEMCG_SWAP
|
||||
~RESOURCE_COUNTERS
|
||||
~CGROUP_PERF
|
||||
"
|
||||
|
||||
ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
|
||||
ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
|
||||
ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
|
||||
|
||||
pkg_setup() {
|
||||
if kernel_is lt 3 8; then
|
||||
eerror ""
|
||||
eerror "Using Docker with kernels older than 3.8 is unstable and unsupported."
|
||||
eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
|
||||
die 'Kernel is too old - need 3.8 or above'
|
||||
fi
|
||||
|
||||
# for where these kernel versions come from, see:
|
||||
# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
|
||||
if ! {
|
||||
kernel_is ge 3 16 \
|
||||
|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
|
||||
|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
|
||||
|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
|
||||
}; then
|
||||
ewarn ""
|
||||
ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
|
||||
ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
|
||||
ewarn ""
|
||||
ewarn "See also https://github.com/docker/docker/issues/2960"
|
||||
fi
|
||||
|
||||
if use aufs; then
|
||||
CONFIG_CHECK+="
|
||||
~AUFS_FS
|
||||
"
|
||||
# TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
|
||||
# an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
|
||||
ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
|
||||
fi
|
||||
|
||||
if use btrfs; then
|
||||
CONFIG_CHECK+="
|
||||
~BTRFS_FS
|
||||
"
|
||||
fi
|
||||
|
||||
if use device-mapper; then
|
||||
CONFIG_CHECK+="
|
||||
~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS
|
||||
"
|
||||
fi
|
||||
|
||||
linux-info_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# allow user patches (use sparingly - upstream won't support them)
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# if we treat them right, Docker's build scripts will set up a
|
||||
# reasonable GOPATH for us
|
||||
export AUTO_GOPATH=1
|
||||
|
||||
# setup CFLAGS and LDFLAGS for separate build target
|
||||
# see https://github.com/tianon/docker-overlay/pull/10
|
||||
export CGO_CFLAGS="-I${ROOT}/usr/include"
|
||||
export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
|
||||
|
||||
# if we're building from a zip, we need the GITCOMMIT value
|
||||
[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
|
||||
|
||||
if gcc-specs-pie; then
|
||||
sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
|
||||
grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
|
||||
|
||||
sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die
|
||||
grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
|
||||
fi
|
||||
|
||||
# let's set up some optional features :)
|
||||
export DOCKER_BUILDTAGS=''
|
||||
for gd in aufs btrfs device-mapper; do
|
||||
if ! use $gd; then
|
||||
DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
|
||||
fi
|
||||
done
|
||||
|
||||
# time to build!
|
||||
./hack/make.sh dynbinary || die 'dynbinary failed'
|
||||
|
||||
# TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh
|
||||
}
|
||||
|
||||
src_install() {
|
||||
VERSION=$(cat VERSION)
|
||||
newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
|
||||
exeinto /usr/libexec/docker
|
||||
newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
|
||||
|
||||
newinitd contrib/init/openrc/docker.initd docker
|
||||
newconfd contrib/init/openrc/docker.confd docker
|
||||
|
||||
systemd_dounit contrib/init/systemd/docker.{service,socket}
|
||||
|
||||
udev_dorules contrib/udev/*.rules
|
||||
|
||||
dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
|
||||
if use doc; then
|
||||
# TODO doman contrib/man/man*/*
|
||||
|
||||
docompress -x /usr/share/doc/${PF}/md
|
||||
docinto md
|
||||
dodoc -r docs/sources/*
|
||||
fi
|
||||
|
||||
dobashcomp contrib/completion/bash/*
|
||||
|
||||
if use zsh-completion; then
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins contrib/completion/zsh/*
|
||||
fi
|
||||
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles
|
||||
doins -r contrib/syntax/vim/ftdetect
|
||||
doins -r contrib/syntax/vim/syntax
|
||||
fi
|
||||
|
||||
if use contrib; then
|
||||
mkdir -p "${D}/usr/share/${PN}/contrib"
|
||||
cp -R contrib/* "${D}/usr/share/${PN}/contrib"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
|
||||
elog ""
|
||||
elog "To use Docker, the Docker daemon must be running as root. To automatically"
|
||||
elog "start the Docker daemon at boot, add Docker to the default runlevel:"
|
||||
elog " rc-update add docker default"
|
||||
elog "Similarly for systemd:"
|
||||
elog " systemctl enable docker.service"
|
||||
elog ""
|
||||
|
||||
# create docker group if the code checking for it in /etc/group exists
|
||||
enewgroup docker
|
||||
|
||||
elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
|
||||
elog " usermod -aG docker youruser"
|
||||
elog ""
|
||||
}
|
||||
@ -1,234 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.4.1.ebuild,v 1.2 2015/02/15 02:08:25 patrick Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
|
||||
HOMEPAGE="https://www.docker.com"
|
||||
|
||||
GITHUB_URI="github.com/docker/docker"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
SRC_URI=""
|
||||
EGIT_REPO_URI="git://${GITHUB_URI}.git"
|
||||
inherit git-2
|
||||
else
|
||||
SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
DOCKER_GITCOMMIT="5bc2ff8"
|
||||
KEYWORDS="~amd64"
|
||||
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 linux-info multilib systemd udev user
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion"
|
||||
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
|
||||
CDEPEND="
|
||||
>=dev-db/sqlite-3.7.9:3
|
||||
device-mapper? (
|
||||
>=sys-fs/lvm2-2.02.89[thin]
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
>=dev-lang/go-1.3
|
||||
<dev-lang/go-1.4
|
||||
btrfs? (
|
||||
>=sys-fs/btrfs-progs-3.16.1
|
||||
)
|
||||
"
|
||||
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
|
||||
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
|
||||
!app-emulation/docker-bin
|
||||
>=net-firewall/iptables-1.4
|
||||
sys-process/procps
|
||||
>=dev-vcs/git-1.7
|
||||
>=app-arch/xz-utils-4.9
|
||||
|
||||
lxc? (
|
||||
>=app-emulation/lxc-1.0
|
||||
)
|
||||
aufs? (
|
||||
|| (
|
||||
sys-fs/aufs3
|
||||
sys-kernel/aufs-sources
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
RESTRICT="installsources strip"
|
||||
|
||||
# see "contrib/check-config.sh" from upstream's sources
|
||||
CONFIG_CHECK="
|
||||
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
|
||||
~DEVPTS_MULTIPLE_INSTANCES
|
||||
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED
|
||||
~MACVLAN ~VETH ~BRIDGE
|
||||
~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
|
||||
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
|
||||
~NF_NAT ~NF_NAT_NEEDED
|
||||
|
||||
~MEMCG_SWAP
|
||||
~RESOURCE_COUNTERS
|
||||
~CGROUP_PERF
|
||||
"
|
||||
|
||||
ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
|
||||
ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
|
||||
ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
|
||||
|
||||
pkg_setup() {
|
||||
if kernel_is lt 3 8; then
|
||||
eerror ""
|
||||
eerror "Using Docker with kernels older than 3.8 is unstable and unsupported."
|
||||
eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
|
||||
die 'Kernel is too old - need 3.8 or above'
|
||||
fi
|
||||
|
||||
# for where these kernel versions come from, see:
|
||||
# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
|
||||
if ! {
|
||||
kernel_is ge 3 16 \
|
||||
|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
|
||||
|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
|
||||
|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
|
||||
}; then
|
||||
ewarn ""
|
||||
ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
|
||||
ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
|
||||
ewarn ""
|
||||
ewarn "See also https://github.com/docker/docker/issues/2960"
|
||||
fi
|
||||
|
||||
if use aufs; then
|
||||
CONFIG_CHECK+="
|
||||
~AUFS_FS
|
||||
"
|
||||
# TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
|
||||
# an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
|
||||
ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
|
||||
fi
|
||||
|
||||
if use btrfs; then
|
||||
CONFIG_CHECK+="
|
||||
~BTRFS_FS
|
||||
"
|
||||
fi
|
||||
|
||||
if use device-mapper; then
|
||||
CONFIG_CHECK+="
|
||||
~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS
|
||||
"
|
||||
fi
|
||||
|
||||
linux-info_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# allow user patches (use sparingly - upstream won't support them)
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# if we treat them right, Docker's build scripts will set up a
|
||||
# reasonable GOPATH for us
|
||||
export AUTO_GOPATH=1
|
||||
|
||||
# setup CFLAGS and LDFLAGS for separate build target
|
||||
# see https://github.com/tianon/docker-overlay/pull/10
|
||||
export CGO_CFLAGS="-I${ROOT}/usr/include"
|
||||
export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
|
||||
|
||||
# if we're building from a zip, we need the GITCOMMIT value
|
||||
[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
|
||||
|
||||
if gcc-specs-pie; then
|
||||
sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
|
||||
grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
|
||||
|
||||
sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die
|
||||
grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
|
||||
fi
|
||||
|
||||
# let's set up some optional features :)
|
||||
export DOCKER_BUILDTAGS=''
|
||||
for gd in aufs btrfs device-mapper; do
|
||||
if ! use $gd; then
|
||||
DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
|
||||
fi
|
||||
done
|
||||
|
||||
# time to build!
|
||||
./hack/make.sh dynbinary || die 'dynbinary failed'
|
||||
|
||||
# TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh
|
||||
}
|
||||
|
||||
src_install() {
|
||||
VERSION=$(cat VERSION)
|
||||
newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
|
||||
exeinto /usr/libexec/docker
|
||||
newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
|
||||
|
||||
newinitd contrib/init/openrc/docker.initd docker
|
||||
newconfd contrib/init/openrc/docker.confd docker
|
||||
|
||||
systemd_dounit contrib/init/systemd/docker.{service,socket}
|
||||
|
||||
udev_dorules contrib/udev/*.rules
|
||||
|
||||
dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
|
||||
if use doc; then
|
||||
# TODO doman contrib/man/man*/*
|
||||
|
||||
docompress -x /usr/share/doc/${PF}/md
|
||||
docinto md
|
||||
dodoc -r docs/sources/*
|
||||
fi
|
||||
|
||||
dobashcomp contrib/completion/bash/*
|
||||
|
||||
if use zsh-completion; then
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins contrib/completion/zsh/*
|
||||
fi
|
||||
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles
|
||||
doins -r contrib/syntax/vim/ftdetect
|
||||
doins -r contrib/syntax/vim/syntax
|
||||
fi
|
||||
|
||||
if use contrib; then
|
||||
mkdir -p "${D}/usr/share/${PN}/contrib"
|
||||
cp -R contrib/* "${D}/usr/share/${PN}/contrib"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
|
||||
elog ""
|
||||
elog "To use Docker, the Docker daemon must be running as root. To automatically"
|
||||
elog "start the Docker daemon at boot, add Docker to the default runlevel:"
|
||||
elog " rc-update add docker default"
|
||||
elog "Similarly for systemd:"
|
||||
elog " systemctl enable docker.service"
|
||||
elog ""
|
||||
|
||||
# create docker group if the code checking for it in /etc/group exists
|
||||
enewgroup docker
|
||||
|
||||
elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
|
||||
elog " usermod -aG docker youruser"
|
||||
elog ""
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
From: Hilko Bengen <bengen@debian.org>
|
||||
Date: Thu, 1 Dec 2011 22:07:26 +0100
|
||||
Subject: Fixed gnulib integration for hivexml
|
||||
|
||||
---
|
||||
lib/Makefile.am | 5 ++++-
|
||||
sh/Makefile.am | 1 +
|
||||
xml/Makefile.am | 3 ++-
|
||||
xml/hivexml.c | 2 ++
|
||||
4 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/Makefile.am b/lib/Makefile.am
|
||||
index cfd2e05..a339a00 100644
|
||||
--- a/lib/Makefile.am
|
||||
+++ b/lib/Makefile.am
|
||||
@@ -39,7 +39,10 @@ libhivex_la_LDFLAGS = \
|
||||
$(LTLIBINTL) \
|
||||
$(LTLIBTHREAD)
|
||||
libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
-libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir)
|
||||
+libhivex_la_CPPFLAGS = \
|
||||
+ -I$(top_srcdir)/gnulib/lib \
|
||||
+ -I$(top_builddir)/gnulib/lib \
|
||||
+ -I$(srcdir)
|
||||
|
||||
include_HEADERS = hivex.h
|
||||
|
||||
diff --git a/sh/Makefile.am b/sh/Makefile.am
|
||||
index 0898370..a6f5ae6 100644
|
||||
--- a/sh/Makefile.am
|
||||
+++ b/sh/Makefile.am
|
||||
@@ -38,6 +38,7 @@ hivexsh_SOURCES = \
|
||||
hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE)
|
||||
hivexsh_CFLAGS = \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
+ -I$(top_builddir)/gnulib/lib \
|
||||
-I$(top_srcdir)/lib \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
diff --git a/xml/Makefile.am b/xml/Makefile.am
|
||||
index b2af45d..67ba248 100644
|
||||
--- a/xml/Makefile.am
|
||||
+++ b/xml/Makefile.am
|
||||
@@ -23,10 +23,11 @@ bin_PROGRAMS = hivexml
|
||||
hivexml_SOURCES = \
|
||||
hivexml.c
|
||||
|
||||
-hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS)
|
||||
+hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS)
|
||||
hivexml_CFLAGS = \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
+ -I$(top_builddir)/gnulib/lib \
|
||||
-I$(top_srcdir)/lib \
|
||||
$(LIBXML2_CFLAGS) \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
diff --git a/xml/hivexml.c b/xml/hivexml.c
|
||||
index 5030c24..d38e9d4 100644
|
||||
--- a/xml/hivexml.c
|
||||
+++ b/xml/hivexml.c
|
||||
@@ -32,6 +32,8 @@
|
||||
#include <libintl.h>
|
||||
#endif
|
||||
|
||||
+#include <getopt.h>
|
||||
+
|
||||
#include <libxml/xmlwriter.h>
|
||||
|
||||
#include "hivex.h"
|
||||
--
|
||||
@ -1,67 +0,0 @@
|
||||
From: Hilko Bengen <bengen@debian.org>
|
||||
Date: Thu, 1 Dec 2011 22:08:07 +0100
|
||||
Subject: automake
|
||||
|
||||
---
|
||||
lib/Makefile.in | 6 +++++-
|
||||
sh/Makefile.in | 1 +
|
||||
xml/Makefile.in | 6 ++++--
|
||||
3 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/Makefile.in b/lib/Makefile.in
|
||||
index 65734dd..5cf7bde 100644
|
||||
--- a/lib/Makefile.in
|
||||
+++ b/lib/Makefile.in
|
||||
@@ -1045,7 +1045,11 @@ libhivex_la_LDFLAGS = \
|
||||
$(LTLIBTHREAD)
|
||||
|
||||
libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
-libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir)
|
||||
+libhivex_la_CPPFLAGS = \
|
||||
+ -I$(top_srcdir)/gnulib/lib \
|
||||
+ -I$(top_builddir)/gnulib/lib \
|
||||
+ -I$(srcdir)
|
||||
+
|
||||
include_HEADERS = hivex.h
|
||||
man_MANS = hivex.3
|
||||
noinst_DATA = \
|
||||
diff --git a/sh/Makefile.in b/sh/Makefile.in
|
||||
index 109c8e8..0308a32 100644
|
||||
--- a/sh/Makefile.in
|
||||
+++ b/sh/Makefile.in
|
||||
@@ -995,6 +995,7 @@ hivexsh_SOURCES = \
|
||||
hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE)
|
||||
hivexsh_CFLAGS = \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
+ -I$(top_builddir)/gnulib/lib \
|
||||
-I$(top_srcdir)/lib \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
diff --git a/xml/Makefile.in b/xml/Makefile.in
|
||||
index ed4cd72..5cb647f 100644
|
||||
--- a/xml/Makefile.in
|
||||
+++ b/xml/Makefile.in
|
||||
@@ -119,7 +119,8 @@ PROGRAMS = $(bin_PROGRAMS)
|
||||
am_hivexml_OBJECTS = hivexml-hivexml.$(OBJEXT)
|
||||
hivexml_OBJECTS = $(am_hivexml_OBJECTS)
|
||||
am__DEPENDENCIES_1 =
|
||||
-hivexml_DEPENDENCIES = ../lib/libhivex.la $(am__DEPENDENCIES_1)
|
||||
+hivexml_DEPENDENCIES = ../lib/libhivex.la ../gnulib/lib/libgnu.la \
|
||||
+ $(am__DEPENDENCIES_1)
|
||||
AM_V_lt = $(am__v_lt_$(V))
|
||||
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_lt_0 = --silent
|
||||
@@ -976,10 +977,11 @@ EXTRA_DIST = \
|
||||
hivexml_SOURCES = \
|
||||
hivexml.c
|
||||
|
||||
-hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS)
|
||||
+hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS)
|
||||
hivexml_CFLAGS = \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
+ -I$(top_builddir)/gnulib/lib \
|
||||
-I$(top_srcdir)/lib \
|
||||
$(LIBXML2_CFLAGS) \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
--
|
||||
@ -1,105 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -183,11 +183,19 @@
|
||||
AC_CHECK_FUNC([open_memstream])
|
||||
AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
|
||||
|
||||
+
|
||||
dnl Check for OCaml (optional, for OCaml bindings).
|
||||
+AC_ARG_ENABLE([ocaml],
|
||||
+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
AC_PROG_OCAML
|
||||
AC_PROG_FINDLIB
|
||||
AM_CONDITIONAL([HAVE_OCAML],
|
||||
- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
+ [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"])
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_OCAMLOPT],
|
||||
[test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
|
||||
@@ -227,21 +235,32 @@
|
||||
dnl Check for Perl modules that must be present to compile and
|
||||
dnl test the Perl bindings.
|
||||
missing_perl_modules=no
|
||||
-for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
|
||||
- AC_MSG_CHECKING([for $pm])
|
||||
- if ! perl -M$pm -e1 >/dev/null 2>&1; then
|
||||
- AC_MSG_RESULT([no])
|
||||
- missing_perl_modules=yes
|
||||
- else
|
||||
- AC_MSG_RESULT([yes])
|
||||
- fi
|
||||
-done
|
||||
-if test "x$missing_perl_modules" = "xyes"; then
|
||||
- AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
|
||||
-fi
|
||||
+AC_ARG_ENABLE([perl],
|
||||
+ AS_HELP_STRING([--with-perl],[build Perl binding]))
|
||||
+
|
||||
+
|
||||
+PERL=
|
||||
+AS_IF([test "x$enable_perl" != "xno" ],[
|
||||
+ AC_CHECK_PROG([PERL],[perl],[yes],[no])
|
||||
+
|
||||
+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
|
||||
+ AC_MSG_CHECKING([for $pm])
|
||||
+ if ! perl -M$pm -e1 >/dev/null 2>&1; then
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ missing_perl_modules=yes
|
||||
+ else
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ fi
|
||||
+ done
|
||||
+
|
||||
+ AS_IF([test "x$missing_perl_modules" = "xyes"],
|
||||
+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
|
||||
+ )
|
||||
+])
|
||||
|
||||
AM_CONDITIONAL([HAVE_PERL],
|
||||
- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
|
||||
+ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
|
||||
+
|
||||
|
||||
dnl Check for Python (optional, for Python bindings).
|
||||
PYTHON_PREFIX=
|
||||
@@ -251,6 +270,7 @@
|
||||
|
||||
AC_CHECK_PROG([PYTHON],[python],[python],[no])
|
||||
|
||||
+
|
||||
if test "x$PYTHON" != "xno"; then
|
||||
AC_MSG_CHECKING([Python prefix])
|
||||
PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
|
||||
@@ -308,15 +328,24 @@
|
||||
AC_SUBST(PYTHON_INCLUDEDIR)
|
||||
AC_SUBST(PYTHON_INSTALLDIR)
|
||||
|
||||
+AC_ARG_ENABLE([python],
|
||||
+ AS_HELP_STRING([--with-python],[build Python binding]))
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_PYTHON],
|
||||
- [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
|
||||
+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
|
||||
+
|
||||
+
|
||||
|
||||
dnl Check for Ruby and rake (optional, for Ruby bindings).
|
||||
+AC_ARG_ENABLE([ruby],
|
||||
+ AS_HELP_STRING([--with-ruby],[build Ruby binding]))
|
||||
+
|
||||
AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
|
||||
AC_CHECK_PROG([RAKE],[rake],[rake],[no])
|
||||
|
||||
AM_CONDITIONAL([HAVE_RUBY],
|
||||
- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
|
||||
+ [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"])
|
||||
+
|
||||
|
||||
dnl dnl Check for Java.
|
||||
dnl AC_ARG_WITH(java_home,
|
||||
@ -1,11 +0,0 @@
|
||||
--- ruby/Rakefile.in.orig 2012-04-16 20:16:14.989449899 +0200
|
||||
+++ ruby/Rakefile.in 2012-04-16 20:17:08.006443779 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
# Build locally
|
||||
|
||||
file MAKEFILE => EXT_CONF do |t|
|
||||
- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
|
||||
+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
|
||||
$stderr.puts "Failed to run extconf"
|
||||
break
|
||||
end
|
||||
@ -1,17 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -187,10 +187,12 @@
|
||||
AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
|
||||
|
||||
dnl Check for OCaml (optional, for OCaml bindings).
|
||||
+AC_ARG_ENABLE([ocaml],
|
||||
+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
|
||||
AC_PROG_OCAML
|
||||
AC_PROG_FINDLIB
|
||||
AM_CONDITIONAL([HAVE_OCAML],
|
||||
- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
+ [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]])
|
||||
AM_CONDITIONAL([HAVE_OCAMLOPT],
|
||||
[test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -245,8 +245,31 @@
|
||||
AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
|
||||
fi
|
||||
|
||||
+AC_ARG_ENABLE([perl],
|
||||
+ AS_HELP_STRING([--with-perl],[build Perl binding]))
|
||||
+
|
||||
+
|
||||
+PERL=
|
||||
+AS_IF([test "x$enable_perl" != "xno" ],[
|
||||
+ AC_CHECK_PROG([PERL],[perl],[yes],[no])
|
||||
+
|
||||
+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
|
||||
+ AC_MSG_CHECKING([for $pm])
|
||||
+ if ! perl -M$pm -e1 >/dev/null 2>&1; then
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ missing_perl_modules=yes
|
||||
+ else
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ fi
|
||||
+ done
|
||||
+
|
||||
+ AS_IF([test "x$missing_perl_modules" = "xyes"],
|
||||
+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
|
||||
+ )
|
||||
+])
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_PERL],
|
||||
- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
|
||||
+ [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
|
||||
|
||||
dnl Check for Python (optional, for Python bindings).
|
||||
PYTHON_PREFIX=
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -336,8 +336,11 @@
|
||||
AC_SUBST(PYTHON_INCLUDEDIR)
|
||||
AC_SUBST(PYTHON_INSTALLDIR)
|
||||
|
||||
+AC_ARG_ENABLE([python],
|
||||
+ AS_HELP_STRING([--with-python],[build Python binding]))
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_PYTHON],
|
||||
- [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
|
||||
+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
|
||||
|
||||
dnl Check for Ruby and rake (optional, for Ruby bindings).
|
||||
AC_ARG_ENABLE([ruby],
|
||||
@ -1,11 +0,0 @@
|
||||
--- ruby/Rakefile.in 2012-03-13 19:46:43.000000000 +0400
|
||||
+++ ruby/Rakefile.in 2012-04-15 19:02:42.337118192 +0400
|
||||
@@ -38,7 +38,7 @@
|
||||
# Build locally
|
||||
|
||||
file MAKEFILE => EXT_CONF do |t|
|
||||
- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
|
||||
+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
|
||||
$stderr.puts "Failed to run extconf"
|
||||
break
|
||||
end
|
||||
@ -1,269 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -187,14 +187,26 @@ AC_CHECK_FUNC([open_memstream])
|
||||
AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
|
||||
|
||||
dnl Check for OCaml (optional, for OCaml bindings).
|
||||
-AC_PROG_OCAML
|
||||
-AC_PROG_FINDLIB
|
||||
+OCAMLC=no
|
||||
+OCAMLFIND=no
|
||||
+AC_ARG_ENABLE([ocaml],
|
||||
+ AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]),
|
||||
+ [],
|
||||
+ [enable_ocaml=yes])
|
||||
+AS_IF([test "x$enable_ocaml" != "xno"],
|
||||
+ [dnl OCAMLC and OCAMLFIND have to be unset first, otherwise
|
||||
+ dnl AC_CHECK_TOOL (inside AC_PROG_OCAML) will not look.
|
||||
+ OCAMLC=
|
||||
+ OCAMLFIND=
|
||||
+ AC_PROG_OCAML
|
||||
+ AC_PROG_FINDLIB
|
||||
+ ])
|
||||
AM_CONDITIONAL([HAVE_OCAML],
|
||||
- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
+ [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
AM_CONDITIONAL([HAVE_OCAMLOPT],
|
||||
- [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
+ [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
|
||||
-if test "x$OCAMLC" != "xno"; then
|
||||
+if test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"; then
|
||||
dnl Check if we have caml/unixsupport.h header (OCaml bindings only).
|
||||
old_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -I$OCAMLLIB"
|
||||
@@ -223,28 +235,32 @@ if test "x$OCAMLC" != "xno"; then
|
||||
rm -f conftest conftest.* conftest_ml.*
|
||||
fi
|
||||
|
||||
-dnl Check for Perl (optional, for Perl bindings).
|
||||
-dnl XXX This isn't quite right, we should check for Perl devel library.
|
||||
+dnl Check for Perl (optional, for Perl bindings and Perl tools).
|
||||
AC_CHECK_PROG([PERL],[perl],[perl],[no])
|
||||
|
||||
-dnl Check for Perl modules that must be present to compile and
|
||||
-dnl test the Perl bindings.
|
||||
-missing_perl_modules=no
|
||||
-for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
|
||||
- AC_MSG_CHECKING([for $pm])
|
||||
- if ! perl -M$pm -e1 >/dev/null 2>&1; then
|
||||
- AC_MSG_RESULT([no])
|
||||
- missing_perl_modules=yes
|
||||
- else
|
||||
- AC_MSG_RESULT([yes])
|
||||
- fi
|
||||
-done
|
||||
-if test "x$missing_perl_modules" = "xyes"; then
|
||||
- AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
|
||||
-fi
|
||||
-
|
||||
+AC_ARG_ENABLE([perl],
|
||||
+ AS_HELP_STRING([--disable-perl], [Disable Perl language bindings]),
|
||||
+ [],
|
||||
+ [enable_perl=yes])
|
||||
+AS_IF([test "x$enable_perl" != "xno"],[
|
||||
+ dnl Check for Perl modules that must be present to compile and
|
||||
+ dnl test the Perl bindings.
|
||||
+ missing_perl_modules=no
|
||||
+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
|
||||
+ AC_MSG_CHECKING([for $pm])
|
||||
+ if ! $PERL -M$pm -e1 >/dev/null 2>&1; then
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ missing_perl_modules=yes
|
||||
+ else
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ fi
|
||||
+ done
|
||||
+ if test "x$missing_perl_modules" = "xyes"; then
|
||||
+ AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
|
||||
+ fi
|
||||
+ ])
|
||||
AM_CONDITIONAL([HAVE_PERL],
|
||||
- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
|
||||
+ [test "x$enable_perl" != "xno" && test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
|
||||
|
||||
dnl Check for Python (optional, for Python bindings).
|
||||
PYTHON_PREFIX=
|
||||
@@ -252,85 +268,111 @@ PYTHON_VERSION=
|
||||
PYTHON_INCLUDEDIR=
|
||||
PYTHON_INSTALLDIR=
|
||||
|
||||
-AC_CHECK_PROG([PYTHON],[python],[python],[no])
|
||||
-
|
||||
-if test "x$PYTHON" != "xno"; then
|
||||
- AC_MSG_CHECKING([Python prefix])
|
||||
- PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
|
||||
- AC_MSG_RESULT([$PYTHON_PREFIX])
|
||||
-
|
||||
- AC_MSG_CHECKING([Python version])
|
||||
- PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
|
||||
- PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
|
||||
- PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
|
||||
- AC_MSG_RESULT([$PYTHON_VERSION])
|
||||
-
|
||||
- AC_MSG_CHECKING([for Python include path])
|
||||
- if test -z "$PYTHON_INCLUDEDIR"; then
|
||||
- python_path=`$PYTHON -c "import distutils.sysconfig; \
|
||||
- print (distutils.sysconfig.get_python_inc ());"`
|
||||
- PYTHON_INCLUDEDIR=$python_path
|
||||
- fi
|
||||
- AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
|
||||
-
|
||||
- AC_ARG_WITH([python-installdir],
|
||||
- [AS_HELP_STRING([--with-python-installdir],
|
||||
- [directory to install python modules @<:@default=check@:>@])],
|
||||
- [PYTHON_INSTALLDIR="$withval"
|
||||
- AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])],
|
||||
- [PYTHON_INSTALLDIR=check])
|
||||
-
|
||||
- if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
|
||||
- PYTHON_INSTALLDIR=
|
||||
- AC_MSG_CHECKING([for Python site-packages path])
|
||||
- if test -z "$PYTHON_INSTALLDIR"; then
|
||||
- PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \
|
||||
- print (distutils.sysconfig.get_python_lib(1,0));"`
|
||||
+AC_ARG_ENABLE([python],
|
||||
+ AS_HELP_STRING([--disable-python], [Disable Python language bindings]),
|
||||
+ [],
|
||||
+ [enable_python=yes])
|
||||
+AS_IF([test "x$enable_python" != "xno"],
|
||||
+ [
|
||||
+ AC_CHECK_PROG([PYTHON],[python],[python],[no])
|
||||
+
|
||||
+ if test "x$PYTHON" != "xno"; then
|
||||
+ AC_MSG_CHECKING([Python prefix])
|
||||
+ PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
|
||||
+ AC_MSG_RESULT([$PYTHON_PREFIX])
|
||||
+
|
||||
+ AC_MSG_CHECKING([Python version])
|
||||
+ PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
|
||||
+ PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
|
||||
+ PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
|
||||
+ AC_MSG_RESULT([$PYTHON_VERSION])
|
||||
+
|
||||
+ AC_MSG_CHECKING([for Python include path])
|
||||
+ if test -z "$PYTHON_INCLUDEDIR"; then
|
||||
+ python_path=`$PYTHON -c "import distutils.sysconfig; \
|
||||
+ print (distutils.sysconfig.get_python_inc ());"`
|
||||
+ PYTHON_INCLUDEDIR=$python_path
|
||||
+ fi
|
||||
+ AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
|
||||
+
|
||||
+ AC_ARG_WITH([python-installdir],
|
||||
+ [AS_HELP_STRING([--with-python-installdir],
|
||||
+ [directory to install python modules @<:@default=check@:>@])],
|
||||
+ [PYTHON_INSTALLDIR="$withval"
|
||||
+ AC_MSG_NOTICE([Python install dir $PYTHON_INSTALLDIR])],
|
||||
+ [PYTHON_INSTALLDIR=check])
|
||||
+
|
||||
+ if test "x$PYTHON_INSTALLDIR" = "xcheck"; then
|
||||
+ PYTHON_INSTALLDIR=
|
||||
+ AC_MSG_CHECKING([for Python site-packages path])
|
||||
+ if test -z "$PYTHON_INSTALLDIR"; then
|
||||
+ PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \
|
||||
+ print (distutils.sysconfig.get_python_lib(1,0));"`
|
||||
+ fi
|
||||
+ AC_MSG_RESULT([$PYTHON_INSTALLDIR])
|
||||
+ fi
|
||||
+
|
||||
+ dnl Look for some optional symbols in libpython.
|
||||
+ old_LIBS="$LIBS"
|
||||
+
|
||||
+ PYTHON_BLDLIBRARY=`$PYTHON -c "import distutils.sysconfig; \
|
||||
+ print (distutils.sysconfig.get_config_var('BLDLIBRARY'))"`
|
||||
+ AC_CHECK_LIB([c],[PyCapsule_New],
|
||||
+ [AC_DEFINE([HAVE_PYCAPSULE_NEW],1,
|
||||
+ [Found PyCapsule_New in libpython])],
|
||||
+ [],[$PYTHON_BLDLIBRARY])
|
||||
+ AC_CHECK_LIB([c],[PyString_AsString],
|
||||
+ [AC_DEFINE([HAVE_PYSTRING_ASSTRING],1,
|
||||
+ [Found PyString_AsString in libpython])],
|
||||
+ [],[$PYTHON_BLDLIBRARY])
|
||||
+
|
||||
+ LIBS="$old_LIBS"
|
||||
fi
|
||||
- AC_MSG_RESULT([$PYTHON_INSTALLDIR])
|
||||
- fi
|
||||
-
|
||||
- dnl Look for libpython and some optional symbols in it.
|
||||
- old_LIBS="$LIBS"
|
||||
- if test "x$PYTHON_VERSION_MAJOR" = "x3"; then
|
||||
- dnl libpython3 is called "libpython3.Xmu.so"
|
||||
- LIBPYTHON="python${PYTHON_VERSION}mu"
|
||||
- else
|
||||
- LIBPYTHON="python$PYTHON_VERSION"
|
||||
- fi
|
||||
- AC_CHECK_LIB([$LIBPYTHON], [PyList_Size], [],
|
||||
- [AC_MSG_FAILURE([$LIBPYTHON is not installed])])
|
||||
-
|
||||
- AC_CHECK_FUNCS([PyCapsule_New \
|
||||
- PyString_AsString])
|
||||
- LIBS="$old_LIBS"
|
||||
-fi
|
||||
-
|
||||
-AC_SUBST(PYTHON_PREFIX)
|
||||
-AC_SUBST(PYTHON_VERSION)
|
||||
-AC_SUBST(PYTHON_INCLUDEDIR)
|
||||
-AC_SUBST(PYTHON_INSTALLDIR)
|
||||
|
||||
+ AC_SUBST(PYTHON_PREFIX)
|
||||
+ AC_SUBST(PYTHON_VERSION)
|
||||
+ AC_SUBST(PYTHON_INCLUDEDIR)
|
||||
+ AC_SUBST(PYTHON_INSTALLDIR)
|
||||
+ ])
|
||||
AM_CONDITIONAL([HAVE_PYTHON],
|
||||
[test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
|
||||
|
||||
dnl Check for Ruby and rake (optional, for Ruby bindings).
|
||||
AC_ARG_ENABLE([ruby],
|
||||
- AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]),
|
||||
- [],
|
||||
- [enable_ruby=yes])
|
||||
-AS_IF([test "x$enable_ruby" != "xno"],
|
||||
- [
|
||||
- AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
|
||||
- AC_CHECK_PROG([RAKE],[rake],[rake],[no])
|
||||
- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
|
||||
- AC_SUBST(RAKE)
|
||||
+ AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]),
|
||||
+ [],
|
||||
+ [enable_ruby=yes])
|
||||
+AS_IF([test "x$enable_ruby" != "xno"],[
|
||||
+ AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
|
||||
+ AC_CHECK_PROG([RAKE],[rake],[rake],[no])
|
||||
+
|
||||
+ AS_IF([test -n "$RUBY" && test -n "$RAKE"],[
|
||||
+ dnl Find the library. Note on Debian it's not -lruby.
|
||||
+ AC_MSG_CHECKING([for C library for Ruby extensions])
|
||||
+ ruby_cmd='puts RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@'
|
||||
+ echo running: $RUBY -rrbconfig -e \'$ruby_cmd\' >&AS_MESSAGE_LOG_FD
|
||||
+ $RUBY -rrbconfig -e "$ruby_cmd" >conftest 2>&AS_MESSAGE_LOG_FD
|
||||
+ libruby="$(cat conftest)"
|
||||
+ rm conftest
|
||||
+ AS_IF([test -n "$libruby"],[
|
||||
+ AC_MSG_RESULT([-l$libruby])
|
||||
+ AC_CHECK_LIB([$libruby],[ruby_init],
|
||||
+ [have_libruby=1],[have_libruby=])
|
||||
+
|
||||
+ dnl Symbols that we substitute when missing.
|
||||
+ AS_IF([test -n "$have_libruby"],[
|
||||
+ old_LIBS="$LIBS"
|
||||
+ LIBS="$LIBS -l$libruby"
|
||||
+ AC_CHECK_FUNCS([rb_hash_lookup])
|
||||
+ LIBS="$old_LIBS"
|
||||
+ ])
|
||||
+ ],[
|
||||
+ AC_MSG_RESULT([not found])
|
||||
])
|
||||
+ ])
|
||||
+])
|
||||
AM_CONDITIONAL([HAVE_RUBY],
|
||||
- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
|
||||
-
|
||||
-AM_CONDITIONAL([HAVE_RUBY],
|
||||
- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
|
||||
+ [test -n "$RUBY" && test -n "$RAKE" && test -n "$have_libruby"])
|
||||
|
||||
dnl dnl Check for Java.
|
||||
dnl AC_ARG_WITH(java_home,
|
||||
@ -1,11 +0,0 @@
|
||||
--- python/Makefile.am 2012-06-12 14:12:50.000000000 +0400
|
||||
+++ python/Makefile.am 2012-09-17 16:21:55.230278577 +0400
|
||||
@@ -35,7 +35,7 @@
|
||||
libhivexmod_la_SOURCES = hivex-py.c
|
||||
libhivexmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
-libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la
|
||||
+libhivexmod_la_LIBADD = $(top_builddir)/lib/libhivex.la -lpython$(PYTHON_VERSION)
|
||||
libhivexmod_la_LDFLAGS = -avoid-version -shared
|
||||
|
||||
TESTS_ENVIRONMENT = \
|
||||
@ -1,17 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -187,10 +187,12 @@
|
||||
AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
|
||||
|
||||
dnl Check for OCaml (optional, for OCaml bindings).
|
||||
+AC_ARG_ENABLE([ocaml],
|
||||
+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
|
||||
AC_PROG_OCAML
|
||||
AC_PROG_FINDLIB
|
||||
AM_CONDITIONAL([HAVE_OCAML],
|
||||
- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
+ [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]])
|
||||
AM_CONDITIONAL([HAVE_OCAMLOPT],
|
||||
[test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -245,8 +245,31 @@
|
||||
AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
|
||||
fi
|
||||
|
||||
+AC_ARG_ENABLE([perl],
|
||||
+ AS_HELP_STRING([--with-perl],[build Perl binding]))
|
||||
+
|
||||
+
|
||||
+PERL=
|
||||
+AS_IF([test "x$enable_perl" != "xno" ],[
|
||||
+ AC_CHECK_PROG([PERL],[perl],[yes],[no])
|
||||
+
|
||||
+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
|
||||
+ AC_MSG_CHECKING([for $pm])
|
||||
+ if ! perl -M$pm -e1 >/dev/null 2>&1; then
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ missing_perl_modules=yes
|
||||
+ else
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ fi
|
||||
+ done
|
||||
+
|
||||
+ AS_IF([test "x$missing_perl_modules" = "xyes"],
|
||||
+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
|
||||
+ )
|
||||
+])
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_PERL],
|
||||
- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
|
||||
+ [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
|
||||
|
||||
dnl Check for Python (optional, for Python bindings).
|
||||
PYTHON_PREFIX=
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -336,8 +336,11 @@
|
||||
AC_SUBST(PYTHON_INCLUDEDIR)
|
||||
AC_SUBST(PYTHON_INSTALLDIR)
|
||||
|
||||
+AC_ARG_ENABLE([python],
|
||||
+ AS_HELP_STRING([--with-python],[build Python binding]))
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_PYTHON],
|
||||
- [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
|
||||
+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
|
||||
|
||||
dnl Check for Ruby and rake (optional, for Ruby bindings).
|
||||
AC_ARG_ENABLE([ruby],
|
||||
@ -1,11 +0,0 @@
|
||||
--- ruby/Rakefile.in 2012-03-13 19:46:43.000000000 +0400
|
||||
+++ ruby/Rakefile.in 2012-04-15 19:02:42.337118192 +0400
|
||||
@@ -38,7 +38,7 @@
|
||||
# Build locally
|
||||
|
||||
file MAKEFILE => EXT_CONF do |t|
|
||||
- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
|
||||
+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
|
||||
$stderr.puts "Failed to run extconf"
|
||||
break
|
||||
end
|
||||
@ -1,11 +0,0 @@
|
||||
--- ruby/Rakefile.in 2012-03-13 19:46:43.000000000 +0400
|
||||
+++ ruby/Rakefile.in 2012-04-15 19:02:42.337118192 +0400
|
||||
@@ -38,7 +38,7 @@
|
||||
# Build locally
|
||||
|
||||
file MAKEFILE => EXT_CONF do |t|
|
||||
- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
|
||||
+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
|
||||
$stderr.puts "Failed to run extconf"
|
||||
break
|
||||
end
|
||||
@ -1,43 +0,0 @@
|
||||
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
|
||||
--- a/ruby/Makefile.am
|
||||
+++ b/ruby/Makefile.am
|
||||
@@ -44,11 +44,11 @@
|
||||
RUBY=$(RUBY) RAKE=$(RAKE)
|
||||
|
||||
all:
|
||||
- $(RAKE) build
|
||||
- $(RAKE) rdoc
|
||||
+ $(RAKE) -v build
|
||||
+ $(RAKE) -v rdoc
|
||||
|
||||
-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
|
||||
-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
|
||||
+RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
|
||||
+RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
|
||||
|
||||
install:
|
||||
$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
|
||||
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
|
||||
--- a/ruby/Rakefile.in
|
||||
+++ b/ruby/Rakefile.in
|
||||
@@ -17,9 +17,9 @@
|
||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
require 'rake/clean'
|
||||
-require 'rake/rdoctask'
|
||||
+require 'rdoc/task'
|
||||
require 'rake/testtask'
|
||||
-require 'rake/gempackagetask'
|
||||
+require 'rubygems/package_task'
|
||||
|
||||
PKG_NAME='@PACKAGE_NAME@'
|
||||
PKG_VERSION='@PACKAGE_VERSION@'
|
||||
@@ -108,7 +108,7 @@
|
||||
EOF
|
||||
end
|
||||
|
||||
-Rake::GemPackageTask.new(SPEC) do |pkg|
|
||||
+Gem::PackageTask.new(SPEC) do |pkg|
|
||||
pkg.need_tar = true
|
||||
pkg.need_zip = true
|
||||
end
|
||||
@ -1,104 +0,0 @@
|
||||
--- configure.ac.orig 2011-08-15 22:29:28.309745342 +0300
|
||||
+++ configure.ac 2011-08-15 22:34:54.324549151 +0300
|
||||
@@ -170,11 +170,18 @@
|
||||
AC_SUBST([LIBXML2_CFLAGS])
|
||||
AC_SUBST([LIBXML2_LIBS])
|
||||
|
||||
+
|
||||
+dnl ////////////////////////////////////////////////////////////////////////////
|
||||
dnl Check for OCaml (optional, for OCaml bindings).
|
||||
+
|
||||
+AC_ARG_ENABLE([ocaml],
|
||||
+ AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
|
||||
+
|
||||
+
|
||||
AC_PROG_OCAML
|
||||
AC_PROG_FINDLIB
|
||||
AM_CONDITIONAL([HAVE_OCAML],
|
||||
- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
+ [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"])
|
||||
AM_CONDITIONAL([HAVE_OCAMLOPT],
|
||||
[test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
|
||||
|
||||
@@ -207,6 +214,8 @@
|
||||
rm -f conftest conftest.* conftest_ml.*
|
||||
fi
|
||||
|
||||
+dnl ///////////////////////////////////////////////////////////////////////////////////////
|
||||
+
|
||||
dnl Check for Perl (optional, for Perl bindings).
|
||||
dnl XXX This isn't quite right, we should check for Perl devel library.
|
||||
AC_CHECK_PROG([PERL],[perl],[perl],[no])
|
||||
@@ -214,21 +223,35 @@
|
||||
dnl Check for Perl modules that must be present to compile and
|
||||
dnl test the Perl bindings.
|
||||
missing_perl_modules=no
|
||||
-for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
|
||||
- AC_MSG_CHECKING([for $pm])
|
||||
- if ! perl -M$pm -e1 >/dev/null 2>&1; then
|
||||
- AC_MSG_RESULT([no])
|
||||
- missing_perl_modules=yes
|
||||
- else
|
||||
- AC_MSG_RESULT([yes])
|
||||
- fi
|
||||
-done
|
||||
-if test "x$missing_perl_modules" = "xyes"; then
|
||||
- AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
|
||||
-fi
|
||||
+
|
||||
+AC_ARG_ENABLE([perl],
|
||||
+ AS_HELP_STRING([--with-perl],[build Perl binding]))
|
||||
+
|
||||
+
|
||||
+PERL=
|
||||
+AS_IF([test "x$enable_perl" != "xno" ],[
|
||||
+ AC_CHECK_PROG([PERL],[perl],[yes],[no])
|
||||
+
|
||||
+ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
|
||||
+ AC_MSG_CHECKING([for $pm])
|
||||
+ if ! perl -M$pm -e1 >/dev/null 2>&1; then
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ missing_perl_modules=yes
|
||||
+ else
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ fi
|
||||
+ done
|
||||
+
|
||||
+ AS_IF([test "x$missing_perl_modules" = "xyes"],
|
||||
+ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
|
||||
+ )
|
||||
+])
|
||||
+
|
||||
|
||||
AM_CONDITIONAL([HAVE_PERL],
|
||||
- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
|
||||
+ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
|
||||
+
|
||||
+dnl //////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
dnl Check for Python (optional, for Python bindings).
|
||||
AC_CHECK_PROG([PYTHON],[python],[python],[no])
|
||||
@@ -266,15 +289,21 @@
|
||||
AC_SUBST(PYTHON_INCLUDEDIR)
|
||||
AC_SUBST(PYTHON_SITE_PACKAGES)
|
||||
|
||||
+AC_ARG_ENABLE([python],
|
||||
+ AS_HELP_STRING([--with-python],[build Python binding]))
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_PYTHON],
|
||||
- [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"])
|
||||
+ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
|
||||
|
||||
dnl Check for Ruby and rake (optional, for Ruby bindings).
|
||||
AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
|
||||
AC_CHECK_PROG([RAKE],[rake],[rake],[no])
|
||||
|
||||
+AC_ARG_ENABLE([ruby],
|
||||
+ AS_HELP_STRING([--with-ruby],[build Ruby binding]))
|
||||
+
|
||||
AM_CONDITIONAL([HAVE_RUBY],
|
||||
- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
|
||||
+ [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"])
|
||||
|
||||
dnl dnl Check for Java.
|
||||
dnl AC_ARG_WITH(java_home,
|
||||
@ -1,11 +0,0 @@
|
||||
--- python/run-python-tests.in 2011-08-11 22:40:25.000000000 +0400
|
||||
+++ python/run-python-tests.in 2011-11-06 11:52:14.064248069 +0400
|
||||
@@ -19,7 +19,7 @@
|
||||
set -e
|
||||
shopt -s nullglob
|
||||
|
||||
-for f in $(srcdir)t/*.py; do
|
||||
+for f in ${srcdir}t/*.py; do
|
||||
basename "$f"
|
||||
@PYTHON@ "$f"
|
||||
done
|
||||
@ -1,11 +0,0 @@
|
||||
--- ruby/Rakefile.in.orig 2012-04-16 20:16:14.989449899 +0200
|
||||
+++ ruby/Rakefile.in 2012-04-16 20:17:08.006443779 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
# Build locally
|
||||
|
||||
file MAKEFILE => EXT_CONF do |t|
|
||||
- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
|
||||
+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
|
||||
$stderr.puts "Failed to run extconf"
|
||||
break
|
||||
end
|
||||
@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2-r2.ebuild,v 1.4 2014/11/16 20:25:35 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
WANT_AUTOMAKE="1.11"
|
||||
AUTOTOOLS_IN_SOURCE_BUILD=1
|
||||
AUTOTOOLS_AUTORECONF=1
|
||||
|
||||
PYTHON_DEPEND="python? 2:2.6"
|
||||
inherit base autotools-utils perl-app python
|
||||
|
||||
DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
|
||||
HOMEPAGE="http://libguestfs.org"
|
||||
SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
IUSE="ocaml readline perl python test static-libs ruby"
|
||||
|
||||
RDEPEND="virtual/libiconv
|
||||
virtual/libintl
|
||||
dev-libs/libxml2:2
|
||||
ocaml? ( dev-lang/ocaml[ocamlopt]
|
||||
dev-ml/findlib[ocamlopt]
|
||||
)
|
||||
readline? ( sys-libs/readline )
|
||||
perl? ( dev-perl/IO-stringy )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
perl? (
|
||||
test? ( dev-perl/Pod-Coverage
|
||||
dev-perl/Test-Pod-Coverage ) )
|
||||
ruby? ( dev-ruby/rake )
|
||||
"
|
||||
PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch
|
||||
"${FILESDIR}"/python-test-fix-${PV}.patch
|
||||
"${FILESDIR}"/ruby_runpath_fix-${PV}.patch)
|
||||
DOCS=(README)
|
||||
|
||||
pkg_setup() {
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
python_need_rebuild
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e '/gets is a security/d' gnulib/lib/stdio.in.h || die "sed failed"
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_with readline)
|
||||
$(use_enable ocaml)
|
||||
$(use_enable perl)
|
||||
--enable-nls
|
||||
$(use_enable python)
|
||||
$(use_enable ruby)
|
||||
--disable-rpath )
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
autotools-utils_src_compile check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
strip-linguas -i po
|
||||
|
||||
autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
|
||||
|
||||
if use perl; then
|
||||
perl_delete_localpod
|
||||
fi
|
||||
}
|
||||
@ -1,124 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.7-r1.ebuild,v 1.4 2015/01/05 19:44:24 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_IN_SOURCE_BUILD=1
|
||||
AUTOTOOLS_AUTORECONF=1
|
||||
WANT_AUTOMAKE=1.11
|
||||
|
||||
USE_RUBY="ruby19"
|
||||
RUBY_OPTIONAL=yes
|
||||
PYTHON_DEPEND="python? 2:2.6"
|
||||
SUPPORT_PYTHON_ABIS=1
|
||||
|
||||
inherit base autotools autotools-utils eutils perl-app ruby-ng python
|
||||
|
||||
DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
|
||||
HOMEPAGE="http://libguestfs.org"
|
||||
SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="ocaml readline +perl python test static-libs ruby"
|
||||
|
||||
RDEPEND="
|
||||
virtual/libiconv
|
||||
virtual/libintl
|
||||
dev-libs/libxml2:2
|
||||
ocaml? ( dev-lang/ocaml[ocamlopt]
|
||||
dev-ml/findlib[ocamlopt]
|
||||
)
|
||||
readline? ( sys-libs/readline )
|
||||
perl? ( dev-perl/IO-stringy )
|
||||
ruby? ( $(ruby_implementations_depend) )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
perl? (
|
||||
test? ( dev-perl/Pod-Coverage
|
||||
dev-perl/Test-Pod-Coverage )
|
||||
)
|
||||
"
|
||||
|
||||
ruby_add_bdepend "ruby? ( dev-ruby/rake )"
|
||||
ruby_add_bdepend "ruby? ( dev-ruby/rdoc )"
|
||||
|
||||
DOCS=(README)
|
||||
PATCHES=("${FILESDIR}"/"${PV}"/*.patch)
|
||||
|
||||
S="${WORKDIR}/${P}"
|
||||
|
||||
pkg_setup() {
|
||||
if use python; then
|
||||
python_pkg_setup
|
||||
fi
|
||||
if use perl; then
|
||||
perl_set_version
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
base_src_prepare
|
||||
eautomake
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_with readline)
|
||||
$(use_enable ocaml)
|
||||
$(use_enable perl)
|
||||
--enable-nls
|
||||
$(use_enable python)
|
||||
$(use_enable ruby)
|
||||
--disable-rpath )
|
||||
|
||||
autotools-utils_src_configure
|
||||
|
||||
if use perl; then
|
||||
pushd perl
|
||||
perl-app_src_configure
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
autotools-utils_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if use perl;then
|
||||
pushd perl
|
||||
perl-app_src_install
|
||||
popd
|
||||
fi
|
||||
|
||||
autotools-utils_src_compile check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
strip-linguas -i po
|
||||
|
||||
autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
|
||||
|
||||
if use perl; then
|
||||
perl_delete_localpod
|
||||
fi
|
||||
if use python; then
|
||||
compile_and_install() {
|
||||
emake -C python clean
|
||||
emake -C python PYTHON_VERSION="${PYTHON_ABI}" \
|
||||
PYTHON_INCLUDEDIR="$(python_get_includedir)" \
|
||||
PYTHON_INSTALLDIR="$(python_get_sitedir)" \
|
||||
DESTDIR="${ED}" install
|
||||
}
|
||||
python_execute_function compile_and_install
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST hsb2hs-0.2.tar.gz 2341 SHA256 dd85a79fd1579257bc5b4c0e7d769f964cd92a7a2db2ea56ed3c1102101d7604 SHA512 d5150ee9914a4916b5162b704a29c23e2c8562c773226b2b2f017304cdd4ce55872f8c7e9be7a5385acc31711f622e74c508bdc40ba1d22981b0e8aec5e4e516 WHIRLPOOL d28a6389e36bb0a5ee4ce486e9c534d6f9f8e1b562503670538f74ec7da24bc7a75038635c9bd06de1c8c1f39875851470a91201cfde612457164994f792d70c
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild,v 1.2 2015/02/18 21:15:38 slyfox Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
# ebuild generated by hackport 0.4.4.9999
|
||||
|
||||
CABAL_FEATURES="bin"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="Preprocesses a file, adding blobs from files as string literals"
|
||||
HOMEPAGE="http://hackage.haskell.org/package/hsb2hs"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.6
|
||||
>dev-haskell/preprocessor-tools-1.0
|
||||
>=dev-lang/ghc-7.4.1
|
||||
"
|
||||
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>haskell</herd>
|
||||
<longdescription>
|
||||
hsb2hs is a preprocessor that allows you to include the contents of
|
||||
files as string literals in your Haskell programs and libraries.
|
||||
It is an alternative to file-embed for those who do not want to rely
|
||||
on Template Haskell. See @README.markdown@ for instructions.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1 @@
|
||||
DIST preprocessor-tools-1.0.1.tar.gz 9895 SHA256 c946c99fe8c9effba27946cd2c26173d2346340528d800a228796d68f8aeee59 SHA512 b039c763eda293950a73c089903bbc2f447b92740077c042a764c2523db581450c96e3fda7ae177336d96626283283843c93006eca73d02951ca9067a3b12665 WHIRLPOOL 5328ef4648f2778a39a089ad40c911203abc037d99a9850165f30225ad189f33a912f4c64087f2e5a5c4cb49a4a0efc587ebcfd72e7346317171c0b6991a124a
|
||||
@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>haskell</herd>
|
||||
<longdescription>
|
||||
This library provides a quick-and-dirty (but often effective)
|
||||
method for extending Haskell's syntax using a custom
|
||||
preprocessor. It parses Haskell into a bare-bones AST with just
|
||||
enough knowledge of the syntax to preserve nesting, and then
|
||||
allows transformations on the AST.
|
||||
|
||||
See the package ixdopp
|
||||
(<http://hackage.haskell.org/cgi-bin/hackage-scripts/package/ixdopp>)
|
||||
for an example of how to do this.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild,v 1.2 2015/02/18 21:15:22 slyfox Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
# ebuild generated by hackport 0.4.4.9999
|
||||
|
||||
CABAL_FEATURES="lib profile haddock hoogle hscolour"
|
||||
inherit haskell-cabal
|
||||
|
||||
DESCRIPTION="A framework for extending Haskell's syntax via quick-and-dirty preprocessors"
|
||||
HOMEPAGE="http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
|
||||
>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
|
||||
>=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?]
|
||||
>=dev-lang/ghc-7.4.1:=
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-haskell/cabal-1.2.3
|
||||
"
|
||||
@ -1,5 +1,3 @@
|
||||
DIST clojure-1.2.0.zip 3586231 SHA256 1334773cb13793bdc0588de0fe5b5aec602bb98ca84858d7374b4e063864d207 SHA512 8c10533eef046d3dba1eb335d0febcdd22664cd428b24c35f860784efd7a699eba1b37808b99c0b8a584266e6c282f7c490cd49bcb7d7363c958f2499cfc41e2 WHIRLPOOL 6a325eceadd752d42b37a6e6adca7cceb4c49058c3af1e9a78e609b111e8e1cc34b53c356f04bf506b388415108209ec78934057b1de98c1d156a41f2021c09f
|
||||
DIST clojure-1.3.0.tar.gz 489200 SHA256 da719ca8600f75001362fefa6427ef14d0a64c3ddc220c79695c44abecdc4a18 SHA512 1078a94afe096bf5862ddda6bd1fccb14d2383151f575b32829e60f2252d94dda972f9e9ca76bf91bc215f51e6529bd895c3653df5d9fa65dbe69e4be519ecdd WHIRLPOOL f3182a533c8081acbafceb5cd41c8f55c053dae673cab8f52274ab357fdf2b8059a512205501f7221d540d60913e115193eeb4c5dd1b46e05ceb56223b465770
|
||||
DIST clojure-1.4.0.tar.gz 501302 SHA256 72e9b69367e5f825fe501629a7bf25d70632a6007751d2a9520be133879f42cd SHA512 618c0de641f2e718e8a0b1ce62a695e61d60a2fc52804018b4fc20caf6e7a99d88ed5af43f2e1f735fc8c19629382f0e53d010b1fca41ca1d4856cd59fadf329 WHIRLPOOL f77b0365e2f1180e0c43412dd0684e33699d7ec517b18af4694e3778cac74593a18de3843f214db5656d39c947a24839942472b5439b90c0c4391c275dd8e927
|
||||
DIST clojure-1.5.1.tar.gz 540021 SHA256 ee6cc9360e3545a35cdd6a9ae48b5f4034ef2eb2aaa19721df976078952a805b SHA512 8bc4b7098ec11a3cd4d077f32607c5d23118d5f84b88af69b2051c4dd5b17f28f092b77206fba87e23f1163d2d0f7a2c37b1b1ffa1bcfef3ad4c8f74695d71cd WHIRLPOOL e77d13a771903100a3fe6b0ade84375217c5b150498e727a7cef2d856a4004e640e0c95717fb67be6cae1fbab7611189a1f3999726f7bbec43968eef646dcb32
|
||||
DIST clojure-1.6.0.tar.gz 579154 SHA256 70b664b24bd8cc7bf0b5519cfa5fa98424eb3e23303fec04b24a03b8bc4f0b4a SHA512 52bf54d157dae77e71e53bac421daa1bca7ef55b837600c8b04751a545cbed0f04d3718543031d1e5b8ca43e2518d356082b9f8c029c2e318996450cfaee9c81 WHIRLPOOL b79b008773ad678e6418a719183c5b240ad0629d3a32384ec6e5979f0377ba2bd39768f27b71da815342bffbd8bdfa5b66cb24e90cf4f489273b33515f591509
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.2.0.ebuild,v 1.5 2010/11/24 19:58:37 darkside Exp $
|
||||
|
||||
EAPI=2
|
||||
JAVA_PKG_IUSE="source test"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
|
||||
HOMEPAGE="http://clojure.org/"
|
||||
SRC_URI="http://github.com/downloads/clojure/clojure/${P}.zip"
|
||||
|
||||
LICENSE="EPL-1.0"
|
||||
SLOT="1.2"
|
||||
KEYWORDS="amd64 x86 ~x86-linux"
|
||||
IUSE="source"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.5"
|
||||
DEPEND=">=virtual/jdk-1.5
|
||||
app-arch/unzip"
|
||||
|
||||
java_prepare() {
|
||||
rm -v ${PN}.jar || die "Failed to remove compile jar."
|
||||
}
|
||||
|
||||
src_test() {
|
||||
java-pkg-2_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar ${P/_/-}.jar
|
||||
java-pkg_dolauncher ${PN}-${SLOT} --main clojure.main
|
||||
dodoc changes.txt readme.txt || die
|
||||
|
||||
if use source; then
|
||||
local zip_name="${PN}-src.zip"
|
||||
local zip_path="${T}/${zip_name}"
|
||||
pushd src/jvm >/dev/null || die "Problem entering Java source directory"
|
||||
zip -q -r ${zip_path} . -i '*.java'
|
||||
popd >/dev/null
|
||||
pushd src/clj >/dev/null || die "Problem entering Clojure source directory"
|
||||
zip -q -r ${zip_path} . -i '*.clj'
|
||||
popd >/dev/null
|
||||
|
||||
INSDESTTREE=${JAVA_PKG_SOURCESPATH} \
|
||||
doins ${zip_path} || die "Failed to install source"
|
||||
|
||||
JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
|
||||
java-pkg_do_write_
|
||||
fi
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.3.0.ebuild,v 1.3 2011/11/17 18:46:11 phajdan.jr Exp $
|
||||
|
||||
EAPI=2
|
||||
JAVA_PKG_IUSE="source test"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
|
||||
HOMEPAGE="http://clojure.org/"
|
||||
SRC_URI="https://github.com/clojure/clojure/tarball/clojure-1.3.0 -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="EPL-1.0"
|
||||
SLOT="1.3"
|
||||
KEYWORDS="amd64 x86 ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=virtual/jre-1.5"
|
||||
DEPEND=">=virtual/jdk-1.5"
|
||||
|
||||
S=${WORKDIR}/clojure-clojure-6375f36
|
||||
|
||||
src_test() {
|
||||
java-pkg-2_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar ${P/_/-}.jar
|
||||
java-pkg_dolauncher ${PN}-${SLOT} --main clojure.main
|
||||
dodoc changes.txt readme.txt || die
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild,v 1.1 2015/02/19 01:06:19 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=PHRED
|
||||
MODULE_VERSION=1.45
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
>=virtual/perl-Compress-Raw-Zlib-2.17
|
||||
>=virtual/perl-File-Spec-0.800.0
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -1,2 +1,3 @@
|
||||
DIST Archive-Zip-1.30.tar.gz 197179 SHA256 f8b472ff77b7238e423bcb351968accc562f9d20700fbf2d8ed2a65fa0fa6318 SHA512 ae717225c54013eb5759982fff5491a8a590a4666b3a93895270c89f361fe289094a35d0caf57320d36fa8f3f5e0c778045a099d0a024f2606c700f0aff3b4e7 WHIRLPOOL 9511cc57941aa8d5367f5041130c27025e90055fa65be6b3ad361d99a07adc9eb9ca9edec00b97fa86478d6b19ab6e604259eab218f9c7e5a0d863771f2a29b8
|
||||
DIST Archive-Zip-1.37.tar.gz 184345 SHA256 ba789436dc82db02a7f3d2e9d120d0221edc83d8c7ec72519648ae64bbc4ce05 SHA512 416dc16286edef085a9fd11b3f98c3abf6345a70552cf4f0d4e0da364b39d400cb259a09f1b33b82ff4aa6494a88e85e59afd80a94ae8446c329eb8a3af63ef1 WHIRLPOOL 07103e2d5a2f23e911b9bc9b3e784e21645864f2e6b08042c577deeaf5b27799c3df0fc8c2a89dfc805840ac0349e88053b173e8db51aefacb2dc7e225d5a8d1
|
||||
DIST Archive-Zip-1.45.tar.gz 186378 SHA256 bc423f96ee07512c968fa788eeccf4b0100f0c4b85f0cacc638b0d658f2f7c7c SHA512 53831db7dd17d3418c593a9961679bfc6cfe067b1f31794664bc60439b332a2e054e8145a156e3eae95f6712dd8cbcc44ed29d7ae8a4fa0f4f1b97ea924e88d4 WHIRLPOOL c71e4c5a05da18ac1f69fccd5b2c35385818bc827d029f1483c7bb07f342def9b1a1a2593fc870c8b30104d4117ff95b2b5316a454f9b0722656bb9e25a7ce6e
|
||||
|
||||
@ -0,0 +1,139 @@
|
||||
--- kivy/graphics.orig/shader.pyx 2015-02-19 07:27:13.062070969 +0100
|
||||
+++ kivy/graphics/shader.pyx 2015-02-19 07:27:22.838737743 +0100
|
||||
@@ -221,13 +221,13 @@
|
||||
'''
|
||||
glUseProgram(0)
|
||||
|
||||
- cdef void set_uniform(self, str name, value):
|
||||
+ cdef void set_uniform(self, str name, value) except *:
|
||||
if name in self.uniform_values and self.uniform_values[name] == value:
|
||||
return
|
||||
self.uniform_values[name] = value
|
||||
self.upload_uniform(name, value)
|
||||
|
||||
- cdef void upload_uniform(self, str name, value):
|
||||
+ cdef void upload_uniform(self, str name, value) except *:
|
||||
'''Pass a uniform variable to the shader.
|
||||
'''
|
||||
cdef long vec_size, index, x, y
|
||||
@@ -412,7 +412,7 @@
|
||||
mat[x] = <GLfloat>value.mat[x]
|
||||
glUniformMatrix4fv(loc, 1, False, mat)
|
||||
|
||||
- cdef int get_uniform_loc(self, str name):
|
||||
+ cdef int get_uniform_loc(self, str name) except *:
|
||||
cdef bytes c_name = name.encode('utf-8')
|
||||
cdef int loc = glGetUniformLocation(self.program, c_name)
|
||||
self.uniform_locations[name] = loc
|
||||
@@ -453,11 +453,11 @@
|
||||
# save for the next run.
|
||||
self._current_vertex_format = vertex_format
|
||||
|
||||
- cdef void build(self):
|
||||
+ cdef void build(self) except *:
|
||||
self.build_vertex()
|
||||
self.build_fragment()
|
||||
|
||||
- cdef void build_vertex(self, int link=1):
|
||||
+ cdef void build_vertex(self, int link=1) except *:
|
||||
if self.vertex_shader is not None:
|
||||
glDetachShader(self.program, self.vertex_shader.shader)
|
||||
self.vertex_shader = None
|
||||
@@ -467,7 +467,7 @@
|
||||
if link:
|
||||
self.link_program()
|
||||
|
||||
- cdef void build_fragment(self, int link=1):
|
||||
+ cdef void build_fragment(self, int link=1) except *:
|
||||
if self.fragment_shader is not None:
|
||||
glDetachShader(self.program, self.fragment_shader.shader)
|
||||
self.fragment_shader = None
|
||||
@@ -477,7 +477,7 @@
|
||||
if link:
|
||||
self.link_program()
|
||||
|
||||
- cdef void link_program(self):
|
||||
+ cdef void link_program(self) except *:
|
||||
if self.vertex_shader is None or self.fragment_shader is None:
|
||||
return
|
||||
|
||||
--- kivy/graphics.orig/instructions.pyx 2015-02-19 07:27:13.062070969 +0100
|
||||
+++ kivy/graphics/instructions.pyx 2014-01-20 03:49:50.000000000 +0100
|
||||
@@ -233,15 +233,15 @@
|
||||
if self.context_pop:
|
||||
context.pop_states(self.context_pop)
|
||||
|
||||
- cdef void set_state(self, str name, value):
|
||||
+ cdef void set_state(self, str name, value) except *:
|
||||
self.context_state[name] = value
|
||||
self.flag_update()
|
||||
|
||||
- cdef void push_state(self, str name):
|
||||
+ cdef void push_state(self, str name) except *:
|
||||
self.context_push.append(name)
|
||||
self.flag_update()
|
||||
|
||||
- cdef void pop_state(self, str name):
|
||||
+ cdef void pop_state(self, str name) except *:
|
||||
self.context_pop.append(name)
|
||||
self.flag_update()
|
||||
|
||||
@@ -764,29 +764,29 @@
|
||||
cdef get_state(self, str name):
|
||||
return self.state_stacks[name][-1]
|
||||
|
||||
- cdef void set_states(self, dict states):
|
||||
+ cdef void set_states(self, dict states) except *:
|
||||
cdef str name
|
||||
for name, value in states.iteritems():
|
||||
self.set_state(name, value)
|
||||
|
||||
- cdef void push_state(self, str name):
|
||||
+ cdef void push_state(self, str name) except *:
|
||||
stack = self.state_stacks[name]
|
||||
stack.append(stack[-1])
|
||||
self.flag_update()
|
||||
|
||||
- cdef void push_states(self, list names):
|
||||
+ cdef void push_states(self, list names) except *:
|
||||
cdef str name
|
||||
for name in names:
|
||||
self.push_state(name)
|
||||
|
||||
- cdef void pop_state(self, str name):
|
||||
+ cdef void pop_state(self, str name) except *:
|
||||
stack = self.state_stacks[name]
|
||||
oldvalue = stack.pop()
|
||||
if oldvalue != stack[-1]:
|
||||
self.set_state(name, stack[-1])
|
||||
self.flag_update()
|
||||
|
||||
- cdef void pop_states(self, list names):
|
||||
+ cdef void pop_states(self, list names) except *:
|
||||
cdef str name
|
||||
for name in names:
|
||||
self.pop_state(name)
|
||||
@@ -806,10 +806,10 @@
|
||||
texture.bind()
|
||||
self.flag_update()
|
||||
|
||||
- cdef void enter(self):
|
||||
+ cdef void enter(self) except *:
|
||||
self._shader.use()
|
||||
|
||||
- cdef void leave(self):
|
||||
+ cdef void leave(self) except *:
|
||||
self._shader.stop()
|
||||
|
||||
cdef void apply(self):
|
||||
--- kivy/graphics.orig/instructions.pxd 2015-02-19 07:44:16.315415541 +0100
|
||||
+++ kivy/graphics/instructions.pxd 2014-01-20 03:49:50.000000000 +0100
|
||||
@@ -115,7 +115,7 @@
|
||||
cdef void pop_states(self, list names) except *
|
||||
cdef void enter(self) except *
|
||||
cdef void leave(self) except *
|
||||
- cdef void apply(self) except *
|
||||
+ cdef void apply(self)
|
||||
cpdef draw(self)
|
||||
cdef void reload(self)
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.2.0_p20100322.ebuild,v 1.5 2011/04/14 20:33:21 ranger Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
RESTRICT_PYTHON_ABIS="3.* *-jython"
|
||||
|
||||
inherit distutils
|
||||
|
||||
MY_P="${P/pyode/PyODE}"
|
||||
SNAPSHOT_DATE="2010-03-22" # This is a snapshot
|
||||
|
||||
DESCRIPTION="Python bindings to the ODE physics engine"
|
||||
HOMEPAGE="http://pyode.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/PyODE-snapshot-${SNAPSHOT_DATE}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
|
||||
IUSE="examples"
|
||||
|
||||
RDEPEND=">=dev-games/ode-0.7
|
||||
>=dev-python/pyrex-0.9.4.1"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/PyODE-snapshot-${SNAPSHOT_DATE}"
|
||||
|
||||
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
|
||||
|
||||
PYTHON_MODNAME="xode"
|
||||
|
||||
src_install() {
|
||||
distutils_src_install
|
||||
# The build system doesnt error if it fails to build
|
||||
# the ode library so we need our own sanity check
|
||||
[[ -z $(find "${D}" -name ode.so) ]] && die "failed to build/install :("
|
||||
|
||||
if use examples; then
|
||||
insinto "/usr/share/doc/${PF}"
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
DIST drydock-0.6.9.gem 23040 SHA256 d2bbd5be1ba4dde949e7eeca15e64c97ad77a853dc56493fa323c11acc182e3f SHA512 f1775c1f6e1f242306a36397b914a510c823ad404926d2e9176202e66903da57ed8810472725cc9762859636385adbfc4c4d46906a3d9126b81e81b7581e3551 WHIRLPOOL 3faefb003ba89e2e6f5710e35c168ef241a4e745c595be7b67474570021491624c7be3a5d170b0e4d3f825263704f9fdca9b13b4770ec01686dda5fe5adacdb2
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue