Version Bump, Corrected HOMEPAGE, #352304

(Portage version: 2.2.0_alpha15/cvs/Linux x86_64)

4 files changed, 171 insertions, 4 deletions

diff --git a/dev-tcltk/tdom/ChangeLog b/dev-tcltk/tdom/ChangeLog
index e93a3aa4c581..3b8e8ff38f3b 100644
--- a/dev-tcltk/tdom/ChangeLog
+++ b/dev-tcltk/tdom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tdom
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.9 2011/01/18 14:47:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.10 2011/01/21 08:00:52 jlec Exp $
+
+*tdom-0.8.3 (21 Jan 2011)
+
+  21 Jan 2011; Justin Lecher <jlec@gentoo.org> tdom-0.8.2.ebuild,
+  +tdom-0.8.3.ebuild, +files/tdom-0.8.3-expat.patch:
+  Version Bump, Corrected HOMEPAGE, #352304
 
   18 Jan 2011; Markos Chandras <hwoarang@gentoo.org> tdom-0.8.2.ebuild:
   Stable on amd64 wrt bug #351766
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch b/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
new file mode 100644
index 000000000000..818850bd8eee
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
@@ -0,0 +1,84 @@
+diff --git a/configure.in b/configure.in
+index 8e634f2..d9999cf 100644
+--- a/configure.in
++++ b/configure.in
+@@ -72,6 +72,7 @@ AC_CHECK_FUNCS(memmove bcopy)
+ #--------------------------------------------------------------------
+ 
+ TDOM_PATH_AOLSERVER
++TDOM_PATH_EXPAT
+ 
+ #-----------------------------------------------------------------------
+ # __CHANGE__
+@@ -83,10 +84,7 @@ TDOM_PATH_AOLSERVER
+ # 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/domhtml.c   \
+@@ -99,7 +97,7 @@ TEA_ADD_SOURCES([expat/xmlrole.c     \
+                  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])
+diff --git a/tdom.m4 b/tdom.m4
+index f5ecd98..fcab883 100644
+--- a/tdom.m4
++++ b/tdom.m4
+@@ -216,6 +216,46 @@ AC_DEFUN(TDOM_PATH_AOLSERVER, [
+     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/tdom-0.8.2.ebuild b/dev-tcltk/tdom/tdom-0.8.2.ebuild
index 81a07871f512..5a471b3ce5ee 100644
--- a/dev-tcltk/tdom/tdom-0.8.2.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6 2011/01/18 14:47:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.2.ebuild,v 1.7 2011/01/21 08:00:52 jlec Exp $
 
 EAPI="3"
 
@@ -9,8 +9,8 @@ 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"
+HOMEPAGE="http://tdom.github.com"
+SRC_URI="https://github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
diff --git a/dev-tcltk/tdom/tdom-0.8.3.ebuild b/dev-tcltk/tdom/tdom-0.8.3.ebuild
new file mode 100644
index 000000000000..f8aa5a7b2e47
--- /dev/null
+++ b/dev-tcltk/tdom/tdom-0.8.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/01/21 08:00:52 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+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"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="threads"
+
+DEPEND="
+	dev-lang/tcl
+	dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/"${PN}-0.8.2.patch \
+		"${FILESDIR}/"${PN}-0.8.2-soname.patch \
+		"${FILESDIR}/"${P}-expat.patch \
+		"${FILESDIR}/"${PN}-0.8.2-tnc.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	myconf="${myconf}
+		$(use_enable threads)
+		--enable-shared
+		--disable-tdomalloc
+		--with-expat"
+
+	cd "${S}"/unix
+	ECONF_SOURCE=".." econf ${myconf}
+
+	# compile tdomhtml
+	cd "${S}"/extensions/tdomhtml
+	econf
+
+	# compile tnc
+	cd "${S}"/extensions/tnc
+	econf ${myconf}
+}
+
+src_compile() {
+	local dir
+
+	for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
+		pushd ${dir} > /dev/null
+			emake || die
+		popd > /dev/null
+	done
+}
+
+src_install() {
+	local dir
+
+	dodoc CHANGES ChangeLog README* || die
+
+	for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
+		pushd ${dir} > /dev/null
+			emake DESTDIR="${D}" install || die
+		popd > /dev/null
+	done
+}