add patches from openSuSE:11, fix bug #248173

(Portage version: 2.1.4.4)

6 files changed, 293 insertions, 2 deletions

diff --git a/dev-tcltk/tdom/ChangeLog b/dev-tcltk/tdom/ChangeLog
index 00dbfa3318bd..6bb262cde6b8 100644
--- a/dev-tcltk/tdom/ChangeLog
+++ b/dev-tcltk/tdom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/tdom
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.2 2006/09/22 07:15:43 matsuu Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.3 2008/12/04 20:14:05 mescalinum Exp $
+
+*tdom-0.8.2 (04 Dec 2008)
+
+  04 Dec 2008; Federico Ferri <mescalinum@gentoo.org>
+  +files/tdom-0.8.2-expat.patch, +files/tdom-0.8.2-tnc.patch,
+  +files/tdom-0.8.2.patch, metadata.xml, +tdom-0.8.2.ebuild:
+  add patches from openSuSE:11, fix bug #248173
 
 *tdom-0.8.0-r1 (22 Sep 2006)
 
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-expat.patch b/dev-tcltk/tdom/files/tdom-0.8.2-expat.patch
new file mode 100644
index 000000000000..cdcbb1006f4d
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.2-expat.patch
@@ -0,0 +1,83 @@
+Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
+Index: Makefile.in
+================================================================================
+--- configure.in
++++ configure.in
+@@ -72,6 +72,7 @@
+ #--------------------------------------------------------------------
+ 
+ TDOM_PATH_AOLSERVER
++TDOM_PATH_EXPAT
+ 
+ #-----------------------------------------------------------------------
+ # __CHANGE__
+@@ -83,10 +84,7 @@
+ # and PKG_TCL_SOURCES.
+ #-----------------------------------------------------------------------
+ 
+-TEA_ADD_SOURCES([expat/xmlrole.c     \
+-                 expat/xmltok.c      \
+-                 expat/xmlparse.c    \
+-                 generic/xmlsimple.c \
++TEA_ADD_SOURCES([generic/xmlsimple.c \
+                  generic/utf8conv.c  \
+                  generic/dom.c       \
+                  generic/domalloc.c  \
+@@ -100,7 +98,7 @@
+                  generic/tclexpat.c  \
+                  generic/tdomStubInit.c])
+ TEA_ADD_HEADERS([generic/tdom.h])
+-TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
++TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
+ TEA_ADD_LIBS([${AOL_LIBS}])
+ TEA_ADD_CFLAGS([])
+ TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
+--- tdom.m4
++++ tdom.m4
+@@ -215,6 +215,46 @@
+     fi
+ ])
+ 
++
++AC_DEFUN(TDOM_PATH_EXPAT, [
++    AC_MSG_CHECKING([for expat])
++    AC_ARG_WITH(expat, 
++        AC_HELP_STRING([--with-expat],
++            [directory with expat installation]), , [with_expat=no])
++
++    AC_CACHE_VAL(ac_cv_c_expat,[
++    case $with_expat in
++	no) ;;
++	yes)
++	    for f in /usr/local /usr; do
++	        if test -f "$f/include/expat.h" ; then
++		    ac_cv_c_expat=`(cd $f; pwd)`
++		    break
++		fi
++	    done
++	    ;;
++	*)
++	    if test -f "$with_expat/include/expat.h"; then
++		ac_cv_c_expat=`(cd $with_expat; pwd)`
++	    else
++        	AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
++	    fi
++    esac
++    ])
++    if test x"${ac_cv_c_expat}" = x ; then
++        AC_MSG_RESULT([using local copy])
++	TEA_ADD_SOURCES([expat/xmlrole.c     \
++                 	 expat/xmltok.c      \
++	                 expat/xmlparse.c])
++	TEA_ADD_INCLUDES([-I${srcdir}/expat])
++    else
++        AC_MSG_RESULT([${ac_cv_c_expat}])
++	TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
++	TEA_ADD_LIBS([-lexpat])
++    fi
++])
++
++
+ #------------------------------------------------------------------------
+ # TDOM_PATH_CONFIG --
+ #
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch b/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
new file mode 100644
index 000000000000..7fa200b9ee33
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
@@ -0,0 +1,73 @@
+Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
+--- extensions/tnc/Makefile.in
++++ extensions/tnc/Makefile.in
+@@ -355,29 +355,30 @@
+ #========================================================================
+ 
+ install-lib-binaries: binaries
+-	@mkdir -p $(DESTDIR)$(pkglibdir)
++	@mkdir -p $(DESTDIR)$(libdir)
+ 	@list='$(lib_BINARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
++	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
+ 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
+ 	    if test "x$$stub" = "xstub"; then \
+-		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
++		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
++		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
+ 	    else \
+-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
++		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
++		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	    fi; \
+ 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
+ 	    if test "x$$ext" = "xdll"; then \
+ 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
+ 		if test -f $$lib; then \
+-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
+-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
++		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
++	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
+ 		fi; \
+ 	    fi; \
+ 	  fi; \
+ 	done
++	@mkdir -p $(DESTDIR)$(pkglibdir)
+ 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    destp=`basename $$p`; \
+--- extensions/tnc/configure.in
++++ extensions/tnc/configure.in
+@@ -89,7 +89,7 @@
+ if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+     TEA_ADD_LIBS([\"`${CYGPATH} ${TDOM_STUB_LIB_PATH}`\"])
+ else
+-    TEA_ADD_LIBS([${TDOM_STUB_LIB_SPEC}])
++    TEA_ADD_LIBS([${TDOM_BUILD_STUB_LIB_SPEC}])
+ fi
+ 
+ #--------------------------------------------------------------------
+--- extensions/tnc/pkgIndex.tcl.in
++++ extensions/tnc/pkgIndex.tcl.in
+@@ -2,4 +2,4 @@
+ 
+ package ifneeded tnc @PACKAGE_VERSION@        \
+     "package require tdom; \
+-     [list load [file join $dir @PKG_LIB_FILE@] tnc]"
++     [list load @PKG_LIB_FILE@ tnc]"
+--- extensions/tnc/Makefile.in
++++ extensions/tnc/Makefile.in
+@@ -160,7 +160,7 @@ DEFS		= @DEFS@ $(PKG_CFLAGS)
+ CONFIG_CLEAN_FILES = Makefile
+ 
+ CPPFLAGS	= @CPPFLAGS@
+-LIBS		= @PKG_LIBS@ @LIBS@
++LIBS		= @PKG_LIBS@ @LIBS@ -L../../unix/
+ AR		= @AR@
+ CFLAGS		= @CFLAGS@
+ COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2.patch b/dev-tcltk/tdom/files/tdom-0.8.2.patch
new file mode 100644
index 000000000000..73af7c60e141
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.2.patch
@@ -0,0 +1,52 @@
+Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
+--- Makefile.in
++++ Makefile.in
+@@ -307,7 +307,7 @@
+ 
+ pkgIndex.tcl-hand:
+ 	@(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION)\
+-	"load [list [file join $$dir $(PKG_LIB_FILE)]];\
++	"load $(PKG_LIB_FILE);\
+          source [list [file join $$dir tdom.tcl]]"'\
+ 	) > pkgIndex.tcl
+ 
+@@ -385,29 +385,30 @@
+ #========================================================================
+ 
+ install-lib-binaries: binaries
+-	@mkdir -p $(DESTDIR)$(pkglibdir)
++	@mkdir -p $(DESTDIR)$(libdir)
+ 	@list='$(lib_BINARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
++	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
+ 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
+ 	    if test "x$$stub" = "xstub"; then \
+-		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
++		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
++		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
+ 	    else \
+-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
++		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
++		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	    fi; \
+ 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
+ 	    if test "x$$ext" = "xdll"; then \
+ 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
+ 		if test -f $$lib; then \
+-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
+-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
++		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
++	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
+ 		fi; \
+ 	    fi; \
+ 	  fi; \
+ 	done
++	@mkdir -p $(DESTDIR)$(pkglibdir)
+ 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    destp=`basename $$p`; \
diff --git a/dev-tcltk/tdom/metadata.xml b/dev-tcltk/tdom/metadata.xml
index d9408d8ab078..8ea740992822 100644
--- a/dev-tcltk/tdom/metadata.xml
+++ b/dev-tcltk/tdom/metadata.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <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
+memory: for example, the DOM tree of the XML recommendation in XML
+(160K) needs only about 450K of memory.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-tcltk/tdom/tdom-0.8.2.ebuild b/dev-tcltk/tdom/tdom-0.8.2.ebuild
new file mode 100644
index 000000000000..c4bc6b0742be
--- /dev/null
+++ b/dev-tcltk/tdom/tdom-0.8.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.2.ebuild,v 1.1 2008/12/04 20:14:05 mescalinum Exp $
+
+inherit autotools eutils
+
+MY_P="tDOM-${PV}"
+DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
+HOMEPAGE="http://www.tdom.org/"
+SRC_URI="http://www.tdom.org/files/${MY_P}.tgz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="threads"
+
+DEPEND=">=dev-lang/tcl-8.4.3
+	>=dev-libs/expat-2.0.1"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	#sed -i -e "s/relid'/relid/" configure* tclconfig/tcl.m4 \
+	#	extensions/tnc/configure extensions/example/{configure,tcl.m4} || die
+	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/${P}-expat.patch"
+	epatch "${FILESDIR}/${P}-tnc.patch"
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+
+	myconf="${myconf} $(use_enable threads)
+		--enable-shared
+		--disable-tdomalloc
+		--with-expat"
+
+	cd "${S}"/unix
+	ECONF_SOURCE=".." econf ${myconf} || die "failed to configure"
+	emake || die "failed to compile tdom"
+
+	# compile tdomhtml
+	cd "${S}"/extensions/tdomhtml
+	econf || die "fail to configure tdomhtml"
+	emake || die "fail to compile tdomhtml"
+
+	# compile tnc
+	cd "${S}"/extensions/tnc
+	econf ${myconf} || die "failed to configure tnc"
+	emake || die "failed to compile tnc"
+}
+
+src_install() {
+	cd "${S}"/unix
+	emake DESTDIR="${D}" install || die
+
+	cd "${S}"/extensions/tdomhtml
+	emake DESTDIR="${D}" install || die
+
+	cd "${S}"/extensions/tnc
+	emake DESTDIR="${D}" install || die
+
+	cd "${S}"
+	dodoc CHANGES ChangeLog README*
+}