QA and removed old versions

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

6 files changed, 40 insertions, 169 deletions

diff --git a/dev-tcltk/tclxml/ChangeLog b/dev-tcltk/tclxml/ChangeLog
index d735cfa89434..e023fbae9b2a 100644
--- a/dev-tcltk/tclxml/ChangeLog
+++ b/dev-tcltk/tclxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/tclxml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.38 2010/10/23 17:41:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/ChangeLog,v 1.39 2010/12/07 12:06:39 jlec Exp $
+
+  07 Dec 2010; Justin Lecher <jlec@gentoo.org> tclxml-2.4.ebuild,
+  tclxml-3.0-r1.ebuild, -tclxml-3.1-r1.ebuild, tclxml-3.1-r2.ebuild,
+  -tclxml-3.2.ebuild:
+  QA and removed old versions
 
   23 Oct 2010; Raúl Porcel <armin76@gentoo.org> tclxml-3.1-r2.ebuild:
   alpha/sparc stable wrt #341645
diff --git a/dev-tcltk/tclxml/tclxml-2.4.ebuild b/dev-tcltk/tclxml/tclxml-2.4.ebuild
index 4fbfa360dab6..58ac89fe3f61 100644
--- a/dev-tcltk/tclxml/tclxml-2.4.ebuild
+++ b/dev-tcltk/tclxml/tclxml-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-2.4.ebuild,v 1.18 2007/12/28 17:22:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-2.4.ebuild,v 1.19 2010/12/07 12:06:39 jlec Exp $
 
 DESCRIPTION="Pure Tcl implementation of an XML parser."
 HOMEPAGE="http://tclxml.sourceforge.net/"
@@ -9,25 +9,27 @@ IUSE=""
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 alpha sparc ~amd64"
+
 DEPEND=">=dev-lang/tcl-8.3.3"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i -e "s/relid'/relid/" \
 		configure tcl.m4 tclconfig/tcl.m4 expat/configure || die
 }
 
 src_compile() {
-	econf || die
+	econf
 	make || die
 
 	# Need to hack the config script.
-	sed -i 's:NONE:/usr:' TclxmlConfig.sh
+	sed -i 's:NONE:/usr:' TclxmlConfig.sh || die
 }
 
 src_install() {
 	einstall || die
-	dodoc ChangeLog LICENSE README RELNOTES
+	dodoc ChangeLog README RELNOTES || die
 }
diff --git a/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild
index c04605f98e6a..4d61f53be7d5 100644
--- a/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild,v 1.6 2007/05/18 22:06:54 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild,v 1.7 2010/12/07 12:06:39 jlec Exp $
 
 inherit eutils
 
@@ -18,15 +18,16 @@ DEPEND=">=dev-lang/tcl-8.2
 	xml? ( >=dev-libs/libxml2-2.6.9 )
 	expat? ( dev-libs/expat )
 	!dev-tcltk/tclxml-expat"
+RDEPEND="${DEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${PN}-3_configure.patch
-	epatch ${FILESDIR}/${PN}-3_include_path.patch
+	epatch "${FILESDIR}"/${PN}-3_configure.patch
+	epatch "${FILESDIR}"/${PN}-3_include_path.patch
 }
 
 src_compile() {
@@ -34,34 +35,34 @@ src_compile() {
 
 	use threads && myconf="${myconf} --enable-threads"
 
-	econf ${myconf} || die
+	econf ${myconf}
 	emake || die
 
 	if use xml ; then
-		cd ${S}/libxml2
-		econf ${myconf} --with-Tclxml=.. || die
+		cd "${S}"/libxml2
+		econf ${myconf} --with-Tclxml=..
 		emake || die
 	fi
 	if use expat ; then
-		cd ${S}/expat
-		econf ${myconf} --with-Tclxml=.. || die
+		cd "${S}"/expat
+		econf ${myconf} --with-Tclxml=..
 		emake || die
 	fi
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 
 	if use xml ; then
-		cd ${S}/libxml2
-		make DESTDIR=${D} install || die
+		cd "${S}"/libxml2
+		emake DESTDIR="${D}" install || die
 	fi
 	if use expat ; then
-		cd ${S}/expat
-		make DESTDIR=${D} install || die
+		cd "${S}"/expat
+		emake DESTDIR="${D}" install || die
 	fi
 
-	cd ${S}
-	dodoc ANNOUNCE ChangeLog LICENSE README RELNOTES
-	dohtml doc/*.html
+	cd "${S}"
+	dodoc ANNOUNCE ChangeLog README RELNOTES || die
+	dohtml doc/*.html || die
 }
diff --git a/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild
deleted file mode 100644
index 6b8f9ed04a84..000000000000
--- a/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild,v 1.2 2007/12/24 11:50:38 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Pure Tcl implementation of an XML parser."
-HOMEPAGE="http://tclxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
-
-IUSE="expat threads xml"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/tcl-8.2
-	>=dev-tcltk/tcllib-1.2
-	xml? ( >=dev-libs/libxml2-2.6.9 )
-	expat? ( dev-libs/expat )
-	!dev-tcltk/tclxml-expat"
-#	test? ( dev-tcltk/tclparser )
-RESTRICT="test"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-3_configure.patch
-	epatch "${FILESDIR}"/${PN}-3_include_path.patch
-	epatch "${FILESDIR}"/${P}-test.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	use threads && myconf="${myconf} --enable-threads"
-
-	econf ${myconf} || die
-	emake || die
-
-	if use xml ; then
-		cd "${S}"/libxml2
-		econf ${myconf} --with-Tclxml=.. || die
-		emake || die
-	fi
-	if use expat ; then
-		cd "${S}"/expat
-		econf ${myconf} --with-Tclxml=.. || die
-		emake || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use xml ; then
-		cd "${S}"/libxml2
-		emake DESTDIR="${D}" install || die
-	fi
-	if use expat ; then
-		cd "${S}"/expat
-		emake DESTDIR="${D}" install || die
-	fi
-
-	cd "${S}"
-	dodoc ANNOUNCE ChangeLog README RELNOTES
-	dohtml doc/*.html
-}
diff --git a/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild
index 94f6a1e7a1c4..a995ef84eea1 100644
--- a/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild,v 1.3 2010/10/23 17:41:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.1-r2.ebuild,v 1.4 2010/12/07 12:06:39 jlec Exp $
 
 inherit autotools eutils
 
@@ -21,6 +21,8 @@ DEPEND=">=dev-lang/tcl-8.2
 		virtual/libiconv )
 	!dev-tcltk/tclxml-expat"
 #	test? ( dev-tcltk/tclparser )
+RDEPEND="${DEPEND}"
+
 RESTRICT="test"
 
 MAKEOPTS="${MAKEOPTS} -j1"
@@ -38,8 +40,8 @@ src_unpack() {
 
 src_compile() {
 	econf ${myconf} \
-      --with-tclinclude="${EPREFIX}"/usr/include \
-      --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
 		$(use_enable amd64 64bit) \
 		$(use_enable debug symbols) \
 		$(use_enable threads)
@@ -48,12 +50,12 @@ src_compile() {
 
 	if use xml ; then
 		cd "${S}"/libxml2
-		econf ${myconf} --with-Tclxml=.. || die
+		econf ${myconf} --with-Tclxml=..
 		emake || die
 	fi
 	if use expat ; then
 		cd "${S}"/expat
-		econf ${myconf} --with-Tclxml=.. || die
+		econf ${myconf} --with-Tclxml=..
 		emake || die
 	fi
 }
diff --git a/dev-tcltk/tclxml/tclxml-3.2.ebuild b/dev-tcltk/tclxml/tclxml-3.2.ebuild
deleted file mode 100644
index a3fc55eb60af..000000000000
--- a/dev-tcltk/tclxml/tclxml-3.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.2.ebuild,v 1.3 2010/06/24 09:08:48 jlec Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Pure Tcl implementation of an XML parser."
-HOMEPAGE="http://tclxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
-
-IUSE="expat threads xml"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="
-	>=dev-lang/tcl-8.2
-	dev-libs/libxslt
-	>=dev-tcltk/tcllib-1.2
-	xml? ( >=dev-libs/libxml2-2.6.9 )
-	expat? ( dev-libs/expat )
-	!dev-tcltk/tclxml-expat"
-#	test? ( dev-tcltk/tclparser )
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-fix-implicit-declarations.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	use threads && myconf="${myconf} --enable-threads"
-
-	econf ${myconf} || die
-	emake || die
-
-	if use xml ; then
-		cd "${S}"/libxml2
-		econf ${myconf} --with-Tclxml=.. || die
-		emake || die
-	fi
-	if use expat ; then
-		cd "${S}"/expat
-		econf ${myconf} --with-Tclxml=.. || die
-		emake || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use xml ; then
-		cd "${S}"/libxml2
-		emake DESTDIR="${D}" install || die
-	fi
-	if use expat ; then
-		cd "${S}"/expat
-		emake DESTDIR="${D}" install || die
-	fi
-
-	cd "${S}"
-	dodoc ANNOUNCE ChangeLog
-	dohtml doc/*.html
-}