From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-tcltk/tclxml/Manifest | 5 +-- .../tclxml/files/tclxml-3.2-format-security.patch | 16 ------- dev-tcltk/tclxml/tclxml-3.2-r2.ebuild | 51 ---------------------- dev-tcltk/tclxml/tclxml-3.2.7.ebuild | 8 ++-- 4 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch delete mode 100644 dev-tcltk/tclxml/tclxml-3.2-r2.ebuild (limited to 'dev-tcltk/tclxml') diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest index 2c340eccbcac..2edf091fe7c4 100644 --- a/dev-tcltk/tclxml/Manifest +++ b/dev-tcltk/tclxml/Manifest @@ -1,8 +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 AUX tclxml-3.2.7-bool.patch 590 BLAKE2B d651d04e44b3021d8be4631a52a65ffcb498e7c27b7b69acc261d91d6e4a09c5066aee71c6f096b2ac599e1b8eaacbf87ffba5a2a46ff403ae2948caf43c4979 SHA512 1178bb6588c5c0632e5611f5c913748943304d9f9a68a7a45b58d254beaca38ceec21120fdf00e7938949ef21037e2d2504e60cd9418a316f8923cc30b72d3e8 DIST tclxml-3.2.7.tar.gz 313751 BLAKE2B 43983d2d6c2f339fa320c4748f889db49fbe9cfff15219e898fdfe5a9a7d6526a2b40b7697fdca6f5272bdfb52cbe68af53ced711ad5d476dc2c5e31898c00ba SHA512 23cb17466f777538088998fa4cce55531708bba517d45cb8b4281401779c418f8532376e4aefcf4bb5f3674ee5bab2e0db25ab2a69c153d3e5820c509edf12ae -DIST tclxml-3.2.tar.gz 757594 BLAKE2B 6ddadb6add6ccba0db55e704ddffafe1c0f22740d27a5c49bf9c8fd00e1592aed46fd1cef49155101ac1544de8559f0d808731c598cf2189ff84a681bbf870e6 SHA512 5e7d45063c1a311d49ecc42f664bf7d88862fc19a46b64f52d038e2adfcc5b6964ae74d61b40bcf8eb4e1440f849339095fd8712bd39f0cb57e279acea58a3da -EBUILD tclxml-3.2-r2.ebuild 1104 BLAKE2B c7fb3d0496a9fae3ee378d98705c47997a6a800f603a24ece4310a329c764255ba167d5b69765be4635bb313938e220e87a719a56e0ea5318e3e3c76c10dce9c SHA512 64f2f89b49e6c3a72e68daedcdbd6baa1b88f66b57396e55ffc2de0dd7100a9781635db83e1046677ba782f9627407709fa8eff7fc052b65bbfef56ac4602590 -EBUILD tclxml-3.2.7.ebuild 1062 BLAKE2B 1b430931363ac9ba46a1af8b373358b3fb8ac63502b3097b4536554abf07d22f8b02be1d52935c2bd94fcc948ab33f187b776ca4f8c9eff9c59454cd56468f6e SHA512 ac6cfad968dba6416c389c8209b82de52dadec85ddea80f631a19078a05426b5f4a1a71f785f830a45a0df8cd6e1aed616c0c017b7886ce19df7897529b4c371 +EBUILD tclxml-3.2.7.ebuild 1053 BLAKE2B 358aa94829fe6b1747c7167eb0016357a0f55df3666b42f1766aa8f2f2bb2d1feeb994807699ef9e114cf315264ce5e5fe25d35ac4b09d683c2a02a80cc354c3 SHA512 98c524e4249ccc6de08f72aced98796fb6f53959bb38d7e42945b582ea17e8e7c6591ed62567bfa7f809066f6d85c4d48c38b31c23f25d12d26e190619f13811 MISC metadata.xml 329 BLAKE2B 6a79c9f1952fa24494921c92da92aaceae631ec090df7e08b39e8f037330cccff13a537c04340364552ad8a0f9c8aa41e642bf5ccc5ecac5264f4836a696fb06 SHA512 32f679fcef8e5ad247a7e566ccfe9098116d093ce83e7326e744dbfede0eeb47fbcc3de723e135a1dd3733d337de6648632ab1b5191ec2e9135d48a3b2988e5d diff --git a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch deleted file mode 100644 index 2d13c6575ea6..000000000000 --- a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch +++ /dev/null @@ -1,16 +0,0 @@ - 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/tclxml-3.2-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild deleted file mode 100644 index 7c563c1ff350..000000000000 --- a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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" -# 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 -} diff --git a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild index 15aa26831c2b..d0971795ffb4 100644 --- a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild +++ b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild @@ -3,17 +3,17 @@ EAPI=7 -inherit eutils multilib +inherit multilib DESCRIPTION="Pure Tcl implementation of an XML parser" HOMEPAGE="http://tclxml.sourceforge.net/" SRC_URI="https://github.com/wjoye/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -IUSE="debug threads" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 ppc sparc x86" +IUSE="debug threads" DEPEND=" >=dev-lang/tcl-8.2:0 @@ -27,8 +27,8 @@ RDEPEND="${DEPEND}" RESTRICT="test" PATCHES=( - "${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch - "${FILESDIR}"/${P}-bool.patch + "${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch + "${FILESDIR}"/${P}-bool.patch ) src_configure() { -- cgit v1.2.3