Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-libs/libxslt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/libxslt')
-rw-r--r--dev-libs/libxslt/Manifest31
-rw-r--r--dev-libs/libxslt/files/digest-libxslt-1.1.153
-rw-r--r--dev-libs/libxslt/files/digest-libxslt-1.1.15-r13
-rw-r--r--dev-libs/libxslt/files/digest-libxslt-1.1.163
-rw-r--r--dev-libs/libxslt/files/libxslt-1.1.15-pattern_fix.patch448
-rw-r--r--dev-libs/libxslt/files/libxslt-1.1.16-pythondir_fix.patch12
-rw-r--r--dev-libs/libxslt/libxslt-1.1.15-r1.ebuild65
-rw-r--r--dev-libs/libxslt/libxslt-1.1.15.ebuild62
-rw-r--r--dev-libs/libxslt/libxslt-1.1.16.ebuild69
9 files changed, 0 insertions, 696 deletions
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index bfdfb7a9f2c6..de2ca475d217 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,34 +1,12 @@
-AUX libxslt-1.1.15-pattern_fix.patch 13404 RMD160 390c01b4988c1df5d9f6d2b77fb7d47dc18cca89 SHA1 7126faa3650488119fb08452a18ed8b15ccbcfa2 SHA256 34c13e32ca69eb5c55669d23e07710f56ec1c275fd78fa8ad2d36cc7f413a0a7
-MD5 684db3ea80f64024cc1d2c3466790f04 files/libxslt-1.1.15-pattern_fix.patch 13404
-RMD160 390c01b4988c1df5d9f6d2b77fb7d47dc18cca89 files/libxslt-1.1.15-pattern_fix.patch 13404
-SHA256 34c13e32ca69eb5c55669d23e07710f56ec1c275fd78fa8ad2d36cc7f413a0a7 files/libxslt-1.1.15-pattern_fix.patch 13404
AUX libxslt-1.1.16-destdir.patch 571 RMD160 31b3581827c4a623e0dab1d4c1face8c1307fad3 SHA1 9a1b19251ef14606492fe406dc3d140abd5efa92 SHA256 c46ac77f8fd0d876eea0f818e4c801a3d365ff8f8800645e47527542575cc962
MD5 bde8b0164cdd2c5d451065c16f5df1ac files/libxslt-1.1.16-destdir.patch 571
RMD160 31b3581827c4a623e0dab1d4c1face8c1307fad3 files/libxslt-1.1.16-destdir.patch 571
SHA256 c46ac77f8fd0d876eea0f818e4c801a3d365ff8f8800645e47527542575cc962 files/libxslt-1.1.16-destdir.patch 571
-AUX libxslt-1.1.16-pythondir_fix.patch 459 RMD160 9e544e636a5aca865e63e18d39386147a1572017 SHA1 1bc3a474f888dad466c80f7c054f0b56e08afacf SHA256 d0c948a6b4ddf483cd493098bf716f579693630ef1394334f136e4af0854614c
-MD5 f502bfe02c3bf5bb20debdde81f250f2 files/libxslt-1.1.16-pythondir_fix.patch 459
-RMD160 9e544e636a5aca865e63e18d39386147a1572017 files/libxslt-1.1.16-pythondir_fix.patch 459
-SHA256 d0c948a6b4ddf483cd493098bf716f579693630ef1394334f136e4af0854614c files/libxslt-1.1.16-pythondir_fix.patch 459
AUX libxslt.m4-libxslt-1.1.8.patch 1292 RMD160 0dcd21978aa0102784df670f2c9835da227f42c8 SHA1 ffa3c5ff84b0636ec4238167e324d377305c4d34 SHA256 0da59fb6cb50bf30e8ac79644df90394707ac07e60337aa3c0e53986781e9e0d
MD5 a772cd7aafe8f9e0fd59de02b2ea2e85 files/libxslt.m4-libxslt-1.1.8.patch 1292
RMD160 0dcd21978aa0102784df670f2c9835da227f42c8 files/libxslt.m4-libxslt-1.1.8.patch 1292
SHA256 0da59fb6cb50bf30e8ac79644df90394707ac07e60337aa3c0e53986781e9e0d files/libxslt.m4-libxslt-1.1.8.patch 1292
-DIST libxslt-1.1.15.tar.bz2 1822862 RMD160 8a560fdc635a2ab8d74ba95f9a98236a52204573 SHA1 1fec57e083fe436bade3ec2352b9bcb9f5169df2 SHA256 6322124f471d6ed4908833cddaba512b247aa169cb8d1ebd87219afe051c6e03
-DIST libxslt-1.1.16.tar.bz2 1861172 RMD160 b1ecc3d9c4372bcbe700c8f51234ed9483eb5ccc SHA1 e6b5d1e93712d52df996de4baa251a05a51e5181 SHA256 9e9840b2bbe4bdc7c0afeba3ee981fdeb4964d2c4109ced127ccc9ef975a9c37
DIST libxslt-1.1.17.tar.bz2 1910630 RMD160 de90b95e5b93df498061d78b85c4ff2a3071d050 SHA1 d9e7c23227664dba7da04f9bbcfbb470f797c6df SHA256 f2ddf1cf7b384f213118bff6403f4465f07e055a52a7bbdadfbe1f67c676de60
-EBUILD libxslt-1.1.15-r1.ebuild 1883 RMD160 8781534c1c99947e138c53e21f32eb48cca93581 SHA1 cc02e0671d04221b61f1f0003b59710a8461a364 SHA256 b135863f47dcf11b66a35aafacf9f0c9ef62ec0e7ba33a078aadcb7db19aa3fa
-MD5 a379ed19fb3ad41d809650e8bebe959a libxslt-1.1.15-r1.ebuild 1883
-RMD160 8781534c1c99947e138c53e21f32eb48cca93581 libxslt-1.1.15-r1.ebuild 1883
-SHA256 b135863f47dcf11b66a35aafacf9f0c9ef62ec0e7ba33a078aadcb7db19aa3fa libxslt-1.1.15-r1.ebuild 1883
-EBUILD libxslt-1.1.15.ebuild 1749 RMD160 8ad9e5bdf8f483eecf86176067cf1da8cafc0ded SHA1 61a5f0ff102b457ffa37c4890a8de8b8d6cae04d SHA256 42c7dc5790bd7ba32741cd2b810c0b00d8d1b2ddf80fa0fa34d1bcb83f067931
-MD5 8d0a9caf015cb42e81bb61f26389f555 libxslt-1.1.15.ebuild 1749
-RMD160 8ad9e5bdf8f483eecf86176067cf1da8cafc0ded libxslt-1.1.15.ebuild 1749
-SHA256 42c7dc5790bd7ba32741cd2b810c0b00d8d1b2ddf80fa0fa34d1bcb83f067931 libxslt-1.1.15.ebuild 1749
-EBUILD libxslt-1.1.16.ebuild 1961 RMD160 43e2de6c89f5d6997990d57f329feadf7eb4bae4 SHA1 032f8d498bdb9f3c1353c4059bce5aea301acb3f SHA256 fd5b5a1e0786a5560c4e750de2e10ec2558e12aa2fec483c4a9da8b6bb315f05
-MD5 31cc37b8cfcb4240bb21bbc4dc88f907 libxslt-1.1.16.ebuild 1961
-RMD160 43e2de6c89f5d6997990d57f329feadf7eb4bae4 libxslt-1.1.16.ebuild 1961
-SHA256 fd5b5a1e0786a5560c4e750de2e10ec2558e12aa2fec483c4a9da8b6bb315f05 libxslt-1.1.16.ebuild 1961
EBUILD libxslt-1.1.17.ebuild 1860 RMD160 e5de4eec218e293f5af165027b53cb4b2a0c8824 SHA1 65904f331af1b8d5d14fa195d246d87e0c75d6f9 SHA256 bb6bd8115f6ba64dd1722d8c81a4d8e92e4c6e5d41fdae4216355ebdd6ea1be2
MD5 9281ee2ad4847da3589f10ec7c83b253 libxslt-1.1.17.ebuild 1860
RMD160 e5de4eec218e293f5af165027b53cb4b2a0c8824 libxslt-1.1.17.ebuild 1860
@@ -41,15 +19,6 @@ MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 661100efff83221b769292fe6f0d1993 files/digest-libxslt-1.1.15 250
-RMD160 86372706ddc840f50a50991809737ba45b7a75d0 files/digest-libxslt-1.1.15 250
-SHA256 588cf2cdf41c649d628086f6117addb677cd24842336430485663ed1039f2b27 files/digest-libxslt-1.1.15 250
-MD5 661100efff83221b769292fe6f0d1993 files/digest-libxslt-1.1.15-r1 250
-RMD160 86372706ddc840f50a50991809737ba45b7a75d0 files/digest-libxslt-1.1.15-r1 250
-SHA256 588cf2cdf41c649d628086f6117addb677cd24842336430485663ed1039f2b27 files/digest-libxslt-1.1.15-r1 250
-MD5 99eb6ae100624fcfe99ae5fa95698f8b files/digest-libxslt-1.1.16 250
-RMD160 7b5bc64cd1c99225a3215cd7b0001eba495bfcb6 files/digest-libxslt-1.1.16 250
-SHA256 0234787395f7be3f30393f371ef7567da163670793f955588396f0b0b32ed876 files/digest-libxslt-1.1.16 250
MD5 99caee7d00a40add9290f4b2529a1032 files/digest-libxslt-1.1.17 250
RMD160 33da9e411cbb7865b91b9921cee8d85a05834e7f files/digest-libxslt-1.1.17 250
SHA256 bcac935f425e6c21dd66d26f727bbf95a41198c1a7f0f849dbacdf8f4df80f23 files/digest-libxslt-1.1.17 250
diff --git a/dev-libs/libxslt/files/digest-libxslt-1.1.15 b/dev-libs/libxslt/files/digest-libxslt-1.1.15
deleted file mode 100644
index ed0997e82420..000000000000
--- a/dev-libs/libxslt/files/digest-libxslt-1.1.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0a48d1a723d5338b246702ab1769e7bf libxslt-1.1.15.tar.bz2 1822862
-RMD160 8a560fdc635a2ab8d74ba95f9a98236a52204573 libxslt-1.1.15.tar.bz2 1822862
-SHA256 6322124f471d6ed4908833cddaba512b247aa169cb8d1ebd87219afe051c6e03 libxslt-1.1.15.tar.bz2 1822862
diff --git a/dev-libs/libxslt/files/digest-libxslt-1.1.15-r1 b/dev-libs/libxslt/files/digest-libxslt-1.1.15-r1
deleted file mode 100644
index ed0997e82420..000000000000
--- a/dev-libs/libxslt/files/digest-libxslt-1.1.15-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0a48d1a723d5338b246702ab1769e7bf libxslt-1.1.15.tar.bz2 1822862
-RMD160 8a560fdc635a2ab8d74ba95f9a98236a52204573 libxslt-1.1.15.tar.bz2 1822862
-SHA256 6322124f471d6ed4908833cddaba512b247aa169cb8d1ebd87219afe051c6e03 libxslt-1.1.15.tar.bz2 1822862
diff --git a/dev-libs/libxslt/files/digest-libxslt-1.1.16 b/dev-libs/libxslt/files/digest-libxslt-1.1.16
deleted file mode 100644
index 7038344a8f38..000000000000
--- a/dev-libs/libxslt/files/digest-libxslt-1.1.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 35e1c422b4b222c860dd56445fa51a8b libxslt-1.1.16.tar.bz2 1861172
-RMD160 b1ecc3d9c4372bcbe700c8f51234ed9483eb5ccc libxslt-1.1.16.tar.bz2 1861172
-SHA256 9e9840b2bbe4bdc7c0afeba3ee981fdeb4964d2c4109ced127ccc9ef975a9c37 libxslt-1.1.16.tar.bz2 1861172
diff --git a/dev-libs/libxslt/files/libxslt-1.1.15-pattern_fix.patch b/dev-libs/libxslt/files/libxslt-1.1.15-pattern_fix.patch
deleted file mode 100644
index ed1433ce0d34..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.15-pattern_fix.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-diff -NurdB libxslt-1.1.15/libxslt/pattern.c libxslt-1.1.15-patched/libxslt/pattern.c
---- libxslt-1.1.15/libxslt/pattern.c 2005-09-04 17:41:43.000000000 -0500
-+++ libxslt-1.1.15-patched/libxslt/pattern.c 2006-03-30 19:23:03.000000000 -0500
-@@ -268,6 +268,7 @@
- * @op: an op
- * @value: the first value
- * @value2: the second value
-+ * @novar: flag to set XML_XPATH_NOVAR
- *
- * Add an step to an XSLT Compiled Match
- *
-@@ -275,7 +276,7 @@
- */
- static int
- xsltCompMatchAdd(xsltParserContextPtr ctxt, xsltCompMatchPtr comp,
-- xsltOp op, xmlChar * value, xmlChar * value2)
-+ xsltOp op, xmlChar * value, xmlChar * value2, int novar)
- {
- if (comp->nbStep >= 40) {
- xsltTransformError(NULL, NULL, NULL,
-@@ -308,7 +309,8 @@
- else
- xctxt = xmlXPathNewContext(NULL);
- #ifdef XML_XPATH_NOVAR
-- xctxt->flags = XML_XPATH_NOVAR;
-+ if (novar != 0)
-+ xctxt->flags = XML_XPATH_NOVAR;
- #endif
- if (ctxt->style != NULL)
- xctxt->dict = ctxt->style->dict;
-@@ -317,7 +319,8 @@
- if (comp->steps[comp->nbStep].comp == NULL) {
- xsltTransformError(NULL, ctxt->style, ctxt->elem,
- "Failed to compile predicate\n");
-- ctxt->style->errors++;
-+ if (ctxt->style != NULL)
-+ ctxt->style->errors++;
- }
- }
- comp->nbStep++;
-@@ -1181,8 +1184,8 @@
- #define NEXT ((*ctxt->cur) ? ctxt->cur++: ctxt->cur)
-
-
--#define PUSH(op, val, val2) \
-- if (xsltCompMatchAdd(ctxt, ctxt->comp, (op), (val), (val2))) goto error;
-+#define PUSH(op, val, val2, novar) \
-+ if (xsltCompMatchAdd(ctxt, ctxt->comp, (op), (val), (val2), (novar))) goto error;
-
- #define SWAP() \
- xsltSwapTopCompMatch(ctxt->comp);
-@@ -1358,6 +1361,7 @@
- * @ctxt: the compilation context
- * @name: a preparsed name
- * @aid: whether id/key are allowed there
-+ * @novar: flag to prohibit xslt var
- *
- * Compile the XSLT LocationIdKeyPattern
- * [3] IdKeyPattern ::= 'id' '(' Literal ')'
-@@ -1370,7 +1374,8 @@
- * | 'processing-instruction' '(' Literal ')'
- */
- static void
--xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name, int aid) {
-+xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
-+ int aid, int novar) {
- xmlChar *lit = NULL;
- xmlChar *lit2 = NULL;
-
-@@ -1394,7 +1399,7 @@
- return;
- }
- NEXT;
-- PUSH(XSLT_OP_ID, lit, NULL);
-+ PUSH(XSLT_OP_ID, lit, NULL, novar);
- } else if ((aid) && (xmlStrEqual(name, (const xmlChar *)"key"))) {
- NEXT;
- SKIP_BLANKS;
-@@ -1422,7 +1427,7 @@
- }
- NEXT;
- /* TODO: support namespace in keys */
-- PUSH(XSLT_OP_KEY, lit, lit2);
-+ PUSH(XSLT_OP_KEY, lit, lit2, novar);
- } else if (xmlStrEqual(name, (const xmlChar *)"processing-instruction")) {
- NEXT;
- SKIP_BLANKS;
-@@ -1439,7 +1444,7 @@
- }
- }
- NEXT;
-- PUSH(XSLT_OP_PI, lit, NULL);
-+ PUSH(XSLT_OP_PI, lit, NULL, novar);
- } else if (xmlStrEqual(name, (const xmlChar *)"text")) {
- NEXT;
- SKIP_BLANKS;
-@@ -1450,7 +1455,7 @@
- return;
- }
- NEXT;
-- PUSH(XSLT_OP_TEXT, NULL, NULL);
-+ PUSH(XSLT_OP_TEXT, NULL, NULL, novar);
- } else if (xmlStrEqual(name, (const xmlChar *)"comment")) {
- NEXT;
- SKIP_BLANKS;
-@@ -1461,7 +1466,7 @@
- return;
- }
- NEXT;
-- PUSH(XSLT_OP_COMMENT, NULL, NULL);
-+ PUSH(XSLT_OP_COMMENT, NULL, NULL, novar);
- } else if (xmlStrEqual(name, (const xmlChar *)"node")) {
- NEXT;
- SKIP_BLANKS;
-@@ -1472,7 +1477,7 @@
- return;
- }
- NEXT;
-- PUSH(XSLT_OP_NODE, NULL, NULL);
-+ PUSH(XSLT_OP_NODE, NULL, NULL, novar);
- } else if (aid) {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileIdKeyPattern : expecting 'key' or 'id' or node type\n");
-@@ -1493,6 +1498,7 @@
- * xsltCompileStepPattern:
- * @ctxt: the compilation context
- * @token: a posible precompiled name
-+ * @novar: flag to prohibit xslt variables from pattern
- *
- * Compile the XSLT StepPattern and generates a precompiled
- * form suitable for fast matching.
-@@ -1511,7 +1517,7 @@
- */
-
- static void
--xsltCompileStepPattern(xsltParserContextPtr ctxt, xmlChar *token) {
-+xsltCompileStepPattern(xsltParserContextPtr ctxt, xmlChar *token, int novar) {
- xmlChar *name = NULL;
- const xmlChar *URI = NULL;
- xmlChar *URL = NULL;
-@@ -1524,7 +1530,7 @@
- NEXT;
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ATTR, NULL, NULL);
-+ PUSH(XSLT_OP_ATTR, NULL, NULL, novar);
- goto parse_predicate;
- }
- token = xsltScanQName(ctxt, &prefix);
-@@ -1544,7 +1550,7 @@
- if (token == NULL) {
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ATTR, NULL, URL);
-+ PUSH(XSLT_OP_ATTR, NULL, URL, novar);
- return;
- }
- xsltTransformError(NULL, NULL, NULL,
-@@ -1552,7 +1558,7 @@
- ctxt->error = 1;
- goto error;
- }
-- PUSH(XSLT_OP_ATTR, token, URL);
-+ PUSH(XSLT_OP_ATTR, token, URL, novar);
- goto parse_predicate;
- }
- if (token == NULL)
-@@ -1560,7 +1566,7 @@
- if (token == NULL) {
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ALL, token, NULL);
-+ PUSH(XSLT_OP_ALL, token, NULL, novar);
- goto parse_predicate;
- } else {
- xsltTransformError(NULL, NULL, NULL,
-@@ -1573,7 +1579,7 @@
-
- SKIP_BLANKS;
- if (CUR == '(') {
-- xsltCompileIdKeyPattern(ctxt, token, 0);
-+ xsltCompileIdKeyPattern(ctxt, token, 0, novar);
- if (ctxt->error)
- goto error;
- } else if (CUR == ':') {
-@@ -1600,7 +1606,7 @@
- if (token == NULL) {
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_NS, URL, NULL);
-+ PUSH(XSLT_OP_NS, URL, NULL, novar);
- } else {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileStepPattern : Name expected\n");
-@@ -1608,7 +1614,7 @@
- goto error;
- }
- } else {
-- PUSH(XSLT_OP_ELEM, token, URL);
-+ PUSH(XSLT_OP_ELEM, token, URL, novar);
- }
- } else {
- NEXT;
-@@ -1618,7 +1624,7 @@
- if (token == NULL) {
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ALL, token, NULL);
-+ PUSH(XSLT_OP_ALL, token, NULL, novar);
- goto parse_predicate;
- } else {
- xsltTransformError(NULL, NULL, NULL,
-@@ -1636,7 +1642,7 @@
- if (URI != NULL)
- URL = xmlStrdup(URI);
- }
-- PUSH(XSLT_OP_CHILD, name, URL);
-+ PUSH(XSLT_OP_CHILD, name, URL, novar);
- } else if (xmlStrEqual(token, (const xmlChar *) "attribute")) {
- xmlFree(token);
- token = xsltScanName(ctxt);
-@@ -1655,7 +1661,7 @@
- if (URI != NULL)
- URL = xmlStrdup(URI);
- }
-- PUSH(XSLT_OP_ATTR, name, URL);
-+ PUSH(XSLT_OP_ATTR, name, URL, novar);
- } else {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileStepPattern : 'child' or 'attribute' expected\n");
-@@ -1666,7 +1672,7 @@
- }
- } else if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ALL, token, NULL);
-+ PUSH(XSLT_OP_ALL, token, NULL, novar);
- } else {
- URI = xsltGetQNameURI(ctxt->elem, &token);
- if (token == NULL) {
-@@ -1675,7 +1681,7 @@
- }
- if (URI != NULL)
- URL = xmlStrdup(URI);
-- PUSH(XSLT_OP_ELEM, token, URL);
-+ PUSH(XSLT_OP_ELEM, token, URL, novar);
- }
- parse_predicate:
- SKIP_BLANKS;
-@@ -1713,7 +1719,7 @@
- return;
- }
- ret = xmlStrndup(q, CUR_PTR - q);
-- PUSH(XSLT_OP_PREDICATE, ret, NULL);
-+ PUSH(XSLT_OP_PREDICATE, ret, NULL, novar);
- /* push the predicate lower than local test */
- SWAP();
- NEXT;
-@@ -1731,6 +1737,7 @@
- * xsltCompileRelativePathPattern:
- * @comp: the compilation context
- * @token: a posible precompiled name
-+ * @novar: flag to prohibit xslt variables
- *
- * Compile the XSLT RelativePathPattern and generates a precompiled
- * form suitable for fast matching.
-@@ -1740,24 +1747,24 @@
- * | RelativePathPattern '//' StepPattern
- */
- static void
--xsltCompileRelativePathPattern(xsltParserContextPtr ctxt, xmlChar *token) {
-- xsltCompileStepPattern(ctxt, token);
-+xsltCompileRelativePathPattern(xsltParserContextPtr ctxt, xmlChar *token, int novar) {
-+ xsltCompileStepPattern(ctxt, token, novar);
- if (ctxt->error)
- goto error;
- SKIP_BLANKS;
- while ((CUR != 0) && (CUR != '|')) {
- if ((CUR == '/') && (NXT(1) == '/')) {
-- PUSH(XSLT_OP_ANCESTOR, NULL, NULL);
-+ PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar);
- NEXT;
- NEXT;
- SKIP_BLANKS;
-- xsltCompileStepPattern(ctxt, NULL);
-+ xsltCompileStepPattern(ctxt, NULL, novar);
- } else if (CUR == '/') {
-- PUSH(XSLT_OP_PARENT, NULL, NULL);
-+ PUSH(XSLT_OP_PARENT, NULL, NULL, novar);
- NEXT;
- SKIP_BLANKS;
- if ((CUR != 0) && (CUR != '|')) {
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- }
- } else {
- ctxt->error = 1;
-@@ -1773,6 +1780,7 @@
- /**
- * xsltCompileLocationPathPattern:
- * @ctxt: the compilation context
-+ * @novar: flag to prohibit xslt variables
- *
- * Compile the XSLT LocationPathPattern and generates a precompiled
- * form suitable for fast matching.
-@@ -1782,7 +1790,7 @@
- * | '//'? RelativePathPattern
- */
- static void
--xsltCompileLocationPathPattern(xsltParserContextPtr ctxt) {
-+xsltCompileLocationPathPattern(xsltParserContextPtr ctxt, int novar) {
- SKIP_BLANKS;
- if ((CUR == '/') && (NXT(1) == '/')) {
- /*
-@@ -1792,22 +1800,22 @@
- NEXT;
- NEXT;
- ctxt->comp->priority = 0.5; /* '//' means not 0 priority */
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- } else if (CUR == '/') {
- /*
- * We need to find root as the parent
- */
- NEXT;
- SKIP_BLANKS;
-- PUSH(XSLT_OP_ROOT, NULL, NULL);
-+ PUSH(XSLT_OP_ROOT, NULL, NULL, novar);
- if ((CUR != 0) && (CUR != '|')) {
-- PUSH(XSLT_OP_PARENT, NULL, NULL);
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ PUSH(XSLT_OP_PARENT, NULL, NULL, novar);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- }
- } else if (CUR == '*') {
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- } else if (CUR == '@') {
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- } else {
- xmlChar *name;
- name = xsltScanName(ctxt);
-@@ -1819,34 +1827,35 @@
- }
- SKIP_BLANKS;
- if ((CUR == '(') && !xmlXPathIsNodeType(name)) {
-- xsltCompileIdKeyPattern(ctxt, name, 1);
-+ xsltCompileIdKeyPattern(ctxt, name, 1, novar);
- if ((CUR == '/') && (NXT(1) == '/')) {
-- PUSH(XSLT_OP_ANCESTOR, NULL, NULL);
-+ PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar);
- NEXT;
- NEXT;
- SKIP_BLANKS;
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- } else if (CUR == '/') {
-- PUSH(XSLT_OP_PARENT, NULL, NULL);
-+ PUSH(XSLT_OP_PARENT, NULL, NULL, novar);
- NEXT;
- SKIP_BLANKS;
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- }
- return;
- }
-- xsltCompileRelativePathPattern(ctxt, name);
-+ xsltCompileRelativePathPattern(ctxt, name, novar);
- }
- error:
- return;
- }
-
- /**
-- * xsltCompilePattern:
-+ * xsltCompilePatternInternal:
- * @pattern: an XSLT pattern
- * @doc: the containing document
- * @node: the containing element
- * @style: the stylesheet
- * @runtime: the transformation context, if done at run-time
-+ * @novar: flag to prohibit xslt variables
- *
- * Compile the XSLT pattern and generates a list of precompiled form suitable
- * for fast matching.
-@@ -1856,10 +1865,10 @@
- * Returns the generated pattern list or NULL in case of failure
- */
-
--xsltCompMatchPtr
--xsltCompilePattern(const xmlChar *pattern, xmlDocPtr doc,
-+static xsltCompMatchPtr
-+xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
- xmlNodePtr node, xsltStylesheetPtr style,
-- xsltTransformContextPtr runtime) {
-+ xsltTransformContextPtr runtime, int novar) {
- xsltParserContextPtr ctxt = NULL;
- xsltCompMatchPtr element, first = NULL, previous = NULL;
- int current, start, end, level, j;
-@@ -1938,7 +1947,7 @@
- This may be changed by xsltCompileLocationPathPattern.
- */
- element->priority = 0;
-- xsltCompileLocationPathPattern(ctxt);
-+ xsltCompileLocationPathPattern(ctxt, novar);
- if (ctxt->error) {
- xsltTransformError(NULL, style, node,
- "xsltCompilePattern : failed to compile '%s'\n",
-@@ -2013,6 +2022,29 @@
- return(NULL);
- }
-
-+/**
-+ * xsltCompilePattern:
-+ * @pattern: an XSLT pattern
-+ * @doc: the containing document
-+ * @node: the containing element
-+ * @style: the stylesheet
-+ * @runtime: the transformation context, if done at run-time
-+ *
-+ * Compile the XSLT pattern and generates a list of precompiled form suitable
-+ * for fast matching.
-+ *
-+ * [1] Pattern ::= LocationPathPattern | Pattern '|' LocationPathPattern
-+ *
-+ * Returns the generated pattern list or NULL in case of failure
-+ */
-+
-+xsltCompMatchPtr
-+xsltCompilePattern(const xmlChar *pattern, xmlDocPtr doc,
-+ xmlNodePtr node, xsltStylesheetPtr style,
-+ xsltTransformContextPtr runtime) {
-+ return (xsltCompilePatternInternal(pattern, doc, node, style, runtime, 0));
-+}
-+
- /************************************************************************
- * *
- * Module interfaces *
-@@ -2041,7 +2073,8 @@
- return(-1);
-
- priority = cur->priority;
-- pat = xsltCompilePattern(cur->match, style->doc, cur->elem, style, NULL);
-+ pat = xsltCompilePatternInternal(cur->match, style->doc, cur->elem,
-+ style, NULL, 1);
- while (pat) {
- next = pat->next;
- pat->next = NULL;
diff --git a/dev-libs/libxslt/files/libxslt-1.1.16-pythondir_fix.patch b/dev-libs/libxslt/files/libxslt-1.1.16-pythondir_fix.patch
deleted file mode 100644
index 929bed267777..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.16-pythondir_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NurdB libxslt-1.1.16/configure libxslt-1.1.16-patched/configure
---- libxslt-1.1.16/configure 2006-05-01 16:28:11.000000000 -0500
-+++ libxslt-1.1.16-patched/configure 2006-05-18 22:25:53.000000000 -0500
-@@ -21724,7 +21724,7 @@
- fi
- if test "$with_python" != ""
- then
-- pythondir=$(PYTHON_SITE_PACKAGES)
-+ pythondir='$(PYTHON_SITE_PACKAGES)'
- else
- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
- fi
diff --git a/dev-libs/libxslt/libxslt-1.1.15-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.15-r1.ebuild
deleted file mode 100644
index e9eca53f78e8..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.15-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.15-r1.ebuild,v 1.2 2006/04/01 02:52:04 flameeyes Exp $
-
-inherit libtool gnome.org eutils python
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt debug python"
-
-DEPEND=">=dev-libs/libxml2-2.6.17
- crypt? ( >=dev-libs/libgcrypt-1.1.92 )
- python? ( dev-lang/python )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # we still require the 1.1.8 patch for the .m4 file, to add
- # the CXXFLAGS defines <obz@gentoo.org>
- epatch "${FILESDIR}"/libxslt.m4-${PN}-1.1.8.patch
-
- # Patch from CVS to fix segfault when processing certain xpath statements
- # (bug #106992)
- epatch "${FILESDIR}"/${P}-pattern_fix.patch
-
- # Patch Makefile to fix bug #99382 so that html gets installed in ${PF}
- sed -i -e 's:libxslt-$(VERSION):${PF}:' doc/Makefile.in
-
- epunt_cxx
- elibtoolize
-}
-
-src_compile() {
- # Always pass --with-debugger. It is required by third parties (see
- # e.g. bug #98345)
- local myconf="--with-debugger \
- $(use_with python) \
- $(use_with crypt crypto) \
- $(use_with debug) \
- $(use_with debug mem-debug)"
-
- econf ${myconf} || die "configure failed"
-
- # Patching the Makefiles to respect get_libdir
- # Fixes BUG #86756, please keep this.
- # Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
- for x in $(find "${S}" -name "Makefile") ; do
- sed \
- -e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \
- -i ${x} \
- || die "sed failed"
- done
-
- emake || die "Compilation failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "Installation failed"
- dodoc AUTHORS ChangeLog FEATURES NEWS README TODO
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.15.ebuild b/dev-libs/libxslt/libxslt-1.1.15.ebuild
deleted file mode 100644
index 201683603614..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.15.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.15.ebuild,v 1.10 2006/03/21 02:52:36 vapier Exp $
-
-inherit libtool gnome.org eutils python
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="crypt debug python static"
-
-DEPEND=">=dev-libs/libxml2-2.6.17
- crypt? ( >=dev-libs/libgcrypt-1.1.92 )
- python? ( dev-lang/python )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # we still require the 1.1.8 patch for the .m4 file, to add
- # the CXXFLAGS defines <obz@gentoo.org>
- epatch "${FILESDIR}"/libxslt.m4-${PN}-1.1.8.patch
-
- # Patch Makefile to fix bug #99382 so that html gets installed in ${PF}
- sed -i -e 's:libxslt-$(VERSION):${PF}:' doc/Makefile.in
-
- epunt_cxx
- elibtoolize
-}
-
-src_compile() {
- # Always pass --with-debugger. It is required by third parties (see
- # e.g. bug #98345)
- local myconf="--with-debugger \
- $(use_with python) \
- $(use_with crypt crypto) \
- $(use_with debug) \
- $(use_with debug mem-debug) \
- $(use_enable static)"
-
- econf ${myconf} || die "configure failed"
-
- # Patching the Makefiles to respect get_libdir
- # Fixes BUG #86756, please keep this.
- # Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
- for x in $(find "${S}" -name "Makefile") ; do
- sed \
- -e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \
- -i ${x} \
- || die "sed failed"
- done
-
- emake || die "Compilation failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "Installation failed"
- dodoc AUTHORS ChangeLog FEATURES NEWS README TODO
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.16.ebuild b/dev-libs/libxslt/libxslt-1.1.16.ebuild
deleted file mode 100644
index fd3c582aaec1..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.16.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.16.ebuild,v 1.1 2006/05/19 03:47:54 leonardop Exp $
-
-inherit libtool gnome.org eutils python
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt debug python"
-
-DEPEND=">=dev-libs/libxml2-2.6.17
- crypt? ( >=dev-libs/libgcrypt-1.1.92 )
- python? ( dev-lang/python )"
-
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # we still require the 1.1.8 patch for the .m4 file, to add
- # the CXXFLAGS defines <obz@gentoo.org>
- epatch "${FILESDIR}"/libxslt.m4-${PN}-1.1.8.patch
-
- # Respect DESTDIR when creating libxslt-plugins directory
- epatch "${FILESDIR}"/${P}-destdir.patch
-
- # Fix declaration of the pythondir variable in configure
- epatch "${FILESDIR}"/${P}-pythondir_fix.patch
-
- # Patch Makefile to fix bug #99382 so that html gets installed in ${PF}
- sed -i -e 's:libxslt-$(VERSION):${PF}:' doc/Makefile.in
-
- epunt_cxx
- elibtoolize
-}
-
-src_compile() {
- # Always pass --with-debugger. It is required by third parties (see
- # e.g. bug #98345)
- local myconf="--with-debugger \
- $(use_with python) \
- $(use_with crypt crypto) \
- $(use_with debug) \
- $(use_with debug mem-debug)"
-
- econf ${myconf} || die "configure failed"
-
- # Patching the Makefiles to respect get_libdir
- # Fixes BUG #86756, please keep this.
- # Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
- for x in $(find "${S}" -name "Makefile") ; do
- sed \
- -e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \
- -i ${x} \
- || die "sed failed"
- done
-
- emake || die "Compilation failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "Installation failed"
-
- dodoc AUTHORS ChangeLog Copyright FEATURES NEWS README TODO
-}