gentoo resync : 14.07.2018

5 files changed, 96 insertions, 0 deletions

diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
new file mode 100644
index 000000000000..61f0df5949b9
--- /dev/null
+++ b/dev-tcltk/tclxml/Manifest
@@ -0,0 +1,5 @@
+AUX tclxml-3.2-fix-implicit-declarations.patch 488 BLAKE2B 1feca37c6c6e87d8c04d884dc6cfcaaacf64eead99f48825cb6473a677161876b3c3be8db6dd04e30195379dbaff2647cfe3cbe8dde4ee3ee9b17d817390100b SHA512 9f8a0c55886c01324e318aec70c99b85f845567a486daddbb897900f242d8a9fec99026c8f6ec7d73e5dca8ee22bf851dc64eab2a83a3a2c959828a24e79e4ca
+AUX tclxml-3.2-format-security.patch 647 BLAKE2B b35232d7b553ee3e95b0a6c1998ad98b50be7198af8383bc5f3e00c6892bac29c257bdce9e04ec783098b878b06736c032b801684d9152b5d8ff1df5c4db771d SHA512 2b76363f015400642f00ce24ef67fd8f7607cd6ed0a63a5768aa343fbe9d6a8af50e15ccebecff813aa0c6d0714d65626c31e2edc860b6b826e52952bb47d435
+DIST tclxml-3.2.tar.gz 757594 BLAKE2B 6ddadb6add6ccba0db55e704ddffafe1c0f22740d27a5c49bf9c8fd00e1592aed46fd1cef49155101ac1544de8559f0d808731c598cf2189ff84a681bbf870e6 SHA512 5e7d45063c1a311d49ecc42f664bf7d88862fc19a46b64f52d038e2adfcc5b6964ae74d61b40bcf8eb4e1440f849339095fd8712bd39f0cb57e279acea58a3da
+EBUILD tclxml-3.2-r2.ebuild 1125 BLAKE2B d3cd42c73cf80bee139f77ca6c63aa4430d9f6765916a93c598f63f0fa1e6b4fb900229fc5cc927ba83004e3b68c2574138440a00b5c71e2b422d04df339823a SHA512 5c8701ca9bb8deaaefe05d18ead1e727004c2f7fc9464c90c76b28c3c4ed34ee8533cb76dfc30f6eaf84c09a11697e2ebc9a88d14dc541d08d93f3e93b2b74e0
+MISC metadata.xml 329 BLAKE2B 6a79c9f1952fa24494921c92da92aaceae631ec090df7e08b39e8f037330cccff13a537c04340364552ad8a0f9c8aa41e642bf5ccc5ecac5264f4836a696fb06 SHA512 32f679fcef8e5ad247a7e566ccfe9098116d093ce83e7326e744dbfede0eeb47fbcc3de723e135a1dd3733d337de6648632ab1b5191ec2e9135d48a3b2988e5d
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2-fix-implicit-declarations.patch b/dev-tcltk/tclxml/files/tclxml-3.2-fix-implicit-declarations.patch
new file mode 100644
index 000000000000..b463306abf1e
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.2-fix-implicit-declarations.patch
@@ -0,0 +1,12 @@
+diff -urpN tclxml-3.2.orig/tclxml.c tclxml-3.2/tclxml.c
+--- tclxml-3.2.orig/tclxml.c	2009-06-08 12:56:10.000000000 +0200
++++ tclxml-3.2/tclxml.c	2009-06-08 12:57:24.000000000 +0200
+@@ -20,6 +20,8 @@
+ #include <tclxslt/tclxslt.h>
+ #include <string.h>
+ 
++int Tcldom_libxml2_Init ( Tcl_Interp *interp );
++
+ #define TCL_DOES_STUBS \
+     (TCL_MAJOR_VERSION > 8 || TCL_MAJOR_VERSION == 8 && (TCL_MINOR_VERSION > 1 || \
+     (TCL_MINOR_VERSION == 1 && TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE)))
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
new file mode 100644
index 000000000000..2d13c6575ea6
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
@@ -0,0 +1,16 @@
+ tclxslt-libxslt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tclxslt-libxslt.c b/tclxslt-libxslt.c
+index d943bf7..d18f645 100644
+--- a/tclxslt-libxslt.c
++++ b/tclxslt-libxslt.c
+@@ -1506,7 +1506,7 @@ TclXSLTExtFunction(xpathCtxt, nargs)
+     obj = TclXSLT_ConvertTclObjToXPathObj(extinfo->interp, resultPtr);
+     valuePush(xpathCtxt, obj);
+   } else {
+-    xmlGenericError(xmlGenericErrorContext,
++    xmlGenericError(xmlGenericErrorContext, "%s",
+ 		    Tcl_GetStringFromObj(resultPtr, NULL));
+     /* Need to define a new error code - this is the closest in meaning */
+     xpathCtxt->error = XPATH_UNKNOWN_FUNC_ERROR;
diff --git a/dev-tcltk/tclxml/metadata.xml b/dev-tcltk/tclxml/metadata.xml
new file mode 100644
index 000000000000..47411252c4c4
--- /dev/null
+++ b/dev-tcltk/tclxml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tclxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
new file mode 100644
index 000000000000..b0a217d741f6
--- /dev/null
+++ b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Pure Tcl implementation of an XML parser"
+HOMEPAGE="http://tclxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
+
+IUSE="debug threads"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86"
+
+DEPEND="
+	>=dev-lang/tcl-8.2:0
+	>=dev-libs/libxml2-2.6.9
+	dev-libs/libxslt
+	>=dev-tcltk/tcllib-1.2
+	dev-libs/expat
+	!dev-tcltk/tcldom"
+#	test? ( dev-tcltk/tclparser )
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fix-implicit-declarations.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	use threads && myconf="${myconf} --enable-threads"
+
+	econf ${myconf} \
+		--with-xml2-config="${EPREFIX}"/usr/bin/xml2-config \
+		--with-xslt-config="${EPREFIX}"/usr/bin/xslt-config \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols)
+}
+
+src_install() {
+	default
+	dohtml doc/*.html
+}