Fix tcl/tk slotting; drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 12 insertions, 173 deletions

diff --git a/x11-libs/xpa/ChangeLog b/x11-libs/xpa/ChangeLog
index 839c1e255240..6b00a8f66d75 100644
--- a/x11-libs/xpa/ChangeLog
+++ b/x11-libs/xpa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xpa
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/ChangeLog,v 1.11 2013/10/28 17:31:23 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/ChangeLog,v 1.12 2015/03/20 14:33:12 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -xpa-2.1.12.ebuild,
+  -xpa-2.1.13.ebuild, -xpa-2.1.14.ebuild, metadata.xml, xpa-2.1.15.ebuild:
+  Fix tcl/tk slotting; drop old
 
 *xpa-2.1.15 (28 Oct 2013)
 
diff --git a/x11-libs/xpa/metadata.xml b/x11-libs/xpa/metadata.xml
index 48c6ff156700..4bab88844f54 100644
--- a/x11-libs/xpa/metadata.xml
+++ b/x11-libs/xpa/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>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   The XPA messaging system provides seamless communication between many
   kinds of Unix programs, including X programs and Tcl/Tk programs. 
   It also provides an easy way for users to communicate with these 
diff --git a/x11-libs/xpa/xpa-2.1.12.ebuild b/x11-libs/xpa/xpa-2.1.12.ebuild
deleted file mode 100644
index bb759e777769..000000000000
--- a/x11-libs/xpa/xpa-2.1.12.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/xpa-2.1.12.ebuild,v 1.2 2011/05/03 17:25:13 jlec Exp $
-
-EAPI=2
-
-inherit eutils autotools
-
-DESCRIPTION="Messaging system providing communication between programs"
-HOMEPAGE="http://hea-www.harvard.edu/RD/xpa/"
-SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-lang/tcl
-	x11-libs/libXt
-	!<sci-astronomy/ds9-5.3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
-	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-threaded-xpans \
-		--with-x \
-		--with-tcl \
-		--with-threads
-}
-
-src_compile() {
-	emake shlib tclxpa || die "emake failed"
-}
-
-src_install () {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	dosym libtclxpa.so.1.0 /usr/$(get_libdir)/libtclxpa.so
-	insinto /usr/$(get_libdir)/tclxpa
-	doins pkgIndex.tcl
-	mv "${D}"/usr/$(get_libdir)/libtclxpa* "${D}"/usr/$(get_libdir)/tclxpa/
-
-	dodoc README
-	if use doc; then
-		cd doc
-		insinto /usr/share/doc/${PF}
-		doins *.pdf || die
-		insinto /usr/share/doc/${PF}/html
-		doins *.html || die
-	fi
-}
diff --git a/x11-libs/xpa/xpa-2.1.13.ebuild b/x11-libs/xpa/xpa-2.1.13.ebuild
deleted file mode 100644
index 507be16e83a9..000000000000
--- a/x11-libs/xpa/xpa-2.1.13.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/xpa-2.1.13.ebuild,v 1.2 2011/08/05 20:58:18 bicatali Exp $
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Messaging system providing communication between programs"
-HOMEPAGE="http://hea-www.harvard.edu/RD/xpa/"
-SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc static-libs"
-
-RDEPEND="dev-lang/tcl
-	x11-libs/libXt
-	!<sci-astronomy/ds9-5.3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
-	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-threaded-xpans \
-		--with-x \
-		--with-tcl \
-		--with-threads
-}
-
-src_compile() {
-	emake shlib tclxpa
-}
-
-src_install () {
-	dodir /usr/$(get_libdir)
-	emake INSTALL_ROOT="${D}" install
-	insinto /usr/$(get_libdir)/tclxpa
-	doins pkgIndex.tcl
-	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
-		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
-	dodoc README
-	use doc && dodoc doc/*.pdf && dohtml doc/*.html
-	# build system so crappy not worth patching to a non respondant upstream
-	# and builds static with PIC
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/x11-libs/xpa/xpa-2.1.14.ebuild b/x11-libs/xpa/xpa-2.1.14.ebuild
deleted file mode 100644
index d9753d7e3527..000000000000
--- a/x11-libs/xpa/xpa-2.1.14.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/xpa-2.1.14.ebuild,v 1.1 2012/07/04 20:29:20 bicatali Exp $
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Messaging system providing communication between programs"
-HOMEPAGE="http://hea-www.harvard.edu/RD/xpa/"
-SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND="dev-lang/tcl
-	x11-libs/libXt
-	!<sci-astronomy/ds9-5.3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
-	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-threaded-xpans \
-		--with-x \
-		--with-tcl \
-		--with-threads
-}
-
-src_compile() {
-	emake shlib tclxpa
-}
-
-src_install () {
-	dodir /usr/$(get_libdir)
-	emake INSTALL_ROOT="${D}" install
-	insinto /usr/$(get_libdir)/tclxpa
-	doins pkgIndex.tcl
-	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
-		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
-	dodoc README
-	use doc && dodoc doc/*.pdf && dohtml doc/*.html
-	# build system so crappy not worth patching to a non respondant upstream
-	# and builds static with PIC
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/x11-libs/xpa/xpa-2.1.15.ebuild b/x11-libs/xpa/xpa-2.1.15.ebuild
index a8d5075ca32c..ade8dcaf0db8 100644
--- a/x11-libs/xpa/xpa-2.1.15.ebuild
+++ b/x11-libs/xpa/xpa-2.1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/xpa-2.1.15.ebuild,v 1.1 2013/10/28 17:31:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpa/xpa-2.1.15.ebuild,v 1.2 2015/03/20 14:33:12 jlec Exp $
 
 EAPI=5
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
-RDEPEND="dev-lang/tcl
+RDEPEND="
+	dev-lang/tcl:0=
 	x11-libs/libXt
 	!<sci-astronomy/ds9-5.3"
 DEPEND="${RDEPEND}"