dev-tcltk/tdom: Add support for tcl8.6, #451548

(Portage version: 2.2.0_alpha152/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 110 insertions, 4 deletions

diff --git a/dev-tcltk/tdom/ChangeLog b/dev-tcltk/tdom/ChangeLog
index 93f1dac853e8..7e84762f7cfa 100644
--- a/dev-tcltk/tdom/ChangeLog
+++ b/dev-tcltk/tdom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tdom
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.16 2012/01/15 16:55:31 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.17 2013/01/15 14:21:40 jlec Exp $
+
+*tdom-0.8.3-r2 (15 Jan 2013)
+
+  15 Jan 2013; Justin Lecher <jlec@gentoo.org> +tdom-0.8.3-r2.ebuild,
+  +files/tdom-0.8.3-tcl8.6.patch, metadata.xml:
+  Add support for tcl8.6, #451548
 
   15 Jan 2012; Justin Lecher <jlec@gentoo.org> -tdom-0.8.2.ebuild:
   Dropped old
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
new file mode 100644
index 000000000000..94bfa22d06e2
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
@@ -0,0 +1,16 @@
+ generic/tcldom.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generic/tcldom.c b/generic/tcldom.c
+index 91d98c9..ae6d413 100644
+--- a/generic/tcldom.c
++++ b/generic/tcldom.c
+@@ -5934,7 +5934,7 @@ int tcldom_EvalLocked (
+     if (ret == TCL_ERROR) {
+         char msg[64 + TCL_INTEGER_SPACE];
+         sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
+-                Tcl_GetString(objv[1]), interp->errorLine);
++                Tcl_GetString(objv[1]), TCL_GetErrorLine(interp));
+         Tcl_AddErrorInfo(interp, msg);
+     }
+ 
diff --git a/dev-tcltk/tdom/metadata.xml b/dev-tcltk/tdom/metadata.xml
index 8de41d4281f0..15cec3cf4c63 100644
--- a/dev-tcltk/tdom/metadata.xml
+++ b/dev-tcltk/tdom/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
-	<longdescription>
+  <herd>tcltk</herd>
+  <longdescription>
 tDOM combines high performance XML data processing with easy and
 powerful Tcl scripting functionality. tDOM should be one of the fastest
 ways to manipulate XML with a scripting language and uses very few
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r2.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r2.ebuild
new file mode 100644
index 000000000000..2a0fa5cb184c
--- /dev/null
+++ b/dev-tcltk/tdom/tdom-0.8.3-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3-r2.ebuild,v 1.1 2013/01/15 14:21:40 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib
+
+MY_P="tDOM-${PV}"
+
+DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
+HOMEPAGE="http://tdom.github.com/"
+#SRC_URI="http://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
+SRC_URI="mirror://github/tDOM/${PN}/${MY_P}.tgz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs threads"
+
+DEPEND="
+	dev-lang/tcl:=
+	dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/"${PN}-0.8.2.patch
+	"${FILESDIR}/"${P}-soname.patch
+	"${FILESDIR}/"${P}-expat.patch
+	"${FILESDIR}/"${PN}-0.8.2-tnc.patch
+	"${FILESDIR}/"${P}-tcl8.6.patch
+	)
+
+src_prepare() {
+	sed \
+		-e 's:-O2::g' \
+		-e 's:-pipe::g' \
+		-e 's:-fomit-frame-pointer::g' \
+		-i {.,extensions/tnc}/configure tclconfig/tcl.m4 || die
+	epatch "${PATCHES[@]}"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable threads)
+		--enable-shared
+		--disable-tdomalloc
+		--with-expat
+		)
+
+	cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs}
+	cd "${S}"/extensions/tdomhtml &&	econf ${myeconfargs}
+	cd "${S}"/extensions/tnc && econf ${myeconfargs}
+}
+
+src_compile() {
+	local dir
+
+	for dir in "${S}"/unix "${S}"/extensions/tnc; do
+		pushd ${dir} > /dev/null
+			emake
+		popd > /dev/null
+	done
+}
+
+src_install() {
+	local dir
+
+	dodoc CHANGES ChangeLog README*
+
+	for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
+		pushd ${dir} > /dev/null
+			emake DESTDIR="${D}" install
+		popd > /dev/null
+	done
+
+	if ! use static-libs; then
+		einfo "Removing static libs ..."
+		rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
+	fi
+}