From 41c63f42de992fb78e07bb4edf16a600a83b8607 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 20 Mar 2015 14:33:13 +0000
Subject: [PATCH] Fix tcl/tk slotting; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
---
 x11-libs/xpa/ChangeLog         |  8 +++--
 x11-libs/xpa/Manifest          | 34 ++++++++++++--------
 x11-libs/xpa/metadata.xml      |  4 +--
 x11-libs/xpa/xpa-2.1.12.ebuild | 58 ----------------------------------
 x11-libs/xpa/xpa-2.1.13.ebuild | 54 -------------------------------
 x11-libs/xpa/xpa-2.1.14.ebuild | 54 -------------------------------
 x11-libs/xpa/xpa-2.1.15.ebuild |  7 ++--
 7 files changed, 32 insertions(+), 187 deletions(-)
 delete mode 100644 x11-libs/xpa/xpa-2.1.12.ebuild
 delete mode 100644 x11-libs/xpa/xpa-2.1.13.ebuild
 delete mode 100644 x11-libs/xpa/xpa-2.1.14.ebuild

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/Manifest b/x11-libs/xpa/Manifest
index b604e377cf38..4c3735d4f098 100644
--- a/x11-libs/xpa/Manifest
+++ b/x11-libs/xpa/Manifest
@@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xpa-2.1.8-makefile.patch 2594 SHA256 24c4470674e4ada96f73461aef267e8fe02846b872c068cdd542e5c24890ee17 SHA512 e36e57ffb8ea86c3f646c4cdd7d3e8e304b6fe48f810cc4081a1dde2a367acfb70846160fef75cf020222002961963126e4c8b5a19f7d5cb5796cbee7429ec5e WHIRLPOOL 1eb4adec97afcc2993cd1f79e1093be326a508f2b90e3a0e73d6b7de8b31690e01dc0f126c6577b55c7fb6ee3c2a4a0b240950c72933a17b0c1b29f5975e47f3
-DIST xpa-2.1.12.tar.gz 847851 SHA256 ed85c2f85a689ab55766ec1aa2840a61f4d64e63b9b640ba690f13895520e4e8
-DIST xpa-2.1.13.tar.gz 853402 SHA256 7e80790ac36d8007b7b352dc8efeccd19efe52c2bb216a571ae4e5aa80a8d311
-DIST xpa-2.1.14.tar.gz 855012 SHA256 69bb966bd3eb4de3344226c6758b6dee954771134048c8139a8ae0cf51ea57c8 SHA512 e13b43ecc3c38cc23802b1458625548ebb23eb8404350fbf8a2467a1d86e672a7892713e9462079526839e7c537450fbb0565a6a66583da15fbb3699765c7f2b WHIRLPOOL 03557fa48de4c1b260b7c72b89c9ff0b65f244150b6f3bf4739ec07822aaf87e811aa324f73ac33d9473ad149685954fd4b25834c1122c5762205da7979e09c3
 DIST xpa-2.1.15.tar.gz 861859 SHA256 ac0e041f9115757fbcbfeb377cb5833544815a70f2b46f6edfbf6d1239ae690a SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8 WHIRLPOOL 7dea8b931a1734c216ccfb79604ef5d291e1ea9230bbf0859895ac132ed2ceb7bc8ca13957d2022c34b641e740febf344b44e897faabf5aec9faf5761cf5213f
-EBUILD xpa-2.1.12.ebuild 1327 SHA256 5398bfc499fde28652bf0825aa4077af0d2f7c5b839d73a1a458705d51f6cffe SHA512 8aa6616ac24f43de490c4d20b34ce3b2192896dd4399d541a2b854f7c4d3ec57f4b9db52915b4e94d2cda0c704f04f1ab2d74265ad6a4645c27b6a3243e804e9 WHIRLPOOL d45ed7b8b46ca24b145bfcc447283938aaeaa48b9d3fee305d5f14c92abfed0974d1d91dec28fb5a2c938ba790d432c71a9feb810e7583f5388b6253e95a1dbc
-EBUILD xpa-2.1.13.ebuild 1347 SHA256 adb5f95c7962a12f10d2b3e68ce33515b85ae0d3941846f2d12c4530af4fbda1 SHA512 5b378d89dce74699a57de9c5e3dc90cd23e9e3b1f683f80f25dc76fda516b585423b06538697bd62fe600aebcd1c427c60a7c9715fd5aec6bad483bc89aaa872 WHIRLPOOL bbb253c52b4621efc753efbb2f93d59c68c55a2fd9d9f68573dc44dad2cc0be494c3a035977f7c05a3a45dd7b146e59cac6b757b6972a025a248f2dd62f5143e
-EBUILD xpa-2.1.14.ebuild 1371 SHA256 d573517f4bebd552171adf8e794b3b4762913efc31c5d039a83f972f3245f277 SHA512 797b68a44a79b9a564e46255fd5802c85217e3ebdf60bef5b7feb66027163e8264c522c515335133c47eb78cefc415f3fc34a26ac1a19cc38708fa88440e34d9 WHIRLPOOL 5bec49776c75c997bb30d52349c8b3061a00a1d2f23669fbc9428b2dbcbbda725aa7f3e3c8fadb0991b5c02d525bb2b9d1280310c00fba8916fac65a25a357d9
-EBUILD xpa-2.1.15.ebuild 1371 SHA256 f26784f845d4b373679e394316167f22573afff1e5e705b6b64828e197bf3415 SHA512 a92d4fc567660cc606f4dd479d9a6c941b742847ce73e76cfadae0b94ac4c964ec5a3a04e7bfe46adc69ebae51926812f8f68fbe26be76eb9036a67c9fdc8480 WHIRLPOOL 556eed9f36d3d3beca9b3e651c48ceb694aa8c775ec0c5ae764096db030182799aabfe0a5ce221bcd32fbd7ae980432d9d079a13e4f2461b221ebbe784d0bc44
-MISC ChangeLog 1705 SHA256 ce3e643905bfb358ae27f580425d0f4d8945aa9512b180a43929401853cea619 SHA512 67ff12e6466965ab814fa5cf3b3d17833063791829db0adc27270ed8ae36c1f49cb42e6e80eb361b0a4da546a4390e2df4a52a06025c3c7ad29b1ceebd5b717e WHIRLPOOL 2d96d9e336555bc3d17c0bc3251397c5ff672a8ca838396bac50bf9dab0e6c6888200a087824ab3f4623978c5fa2b2988f7658a3e76f3ed60c9c9263df26f6c9
-MISC metadata.xml 846 SHA256 31c0bbbf8b65938a76a7df1b288a29ef0944cfb9706c2baae48c749953a7bf62 SHA512 098bf94d2d130bd4e033a19a917ab85f13b1f0319708d50ea6c2a7e51a35189e1f3d00e53b31358b882a0cc31f8d7b4ee8f86f91e37e7366c790cc6b35c957d2 WHIRLPOOL f9cc3a5147e0f3c49686e5c100184881e2a04f1902d0237a8a5d5e65c50c73054d31e00fc4e826d165b933609136c084ea9faed22273ffd128f9ab6a72ad4044
+EBUILD xpa-2.1.15.ebuild 1372 SHA256 3765793ebb969fd95096fe61205ec2bda241b2b2e2b0885aa55ef4379d96dbe5 SHA512 2bd3586be2ae698f40881777f7baaa6b17d5cbb9c7efcdc861b801040f2d3c6ac3356e7d0bef4fc70c7306ee0382f778ab7d0ca55750cc287cba9ac406fc77a0 WHIRLPOOL 1728d466bfa10386dd2b693fc686d53dfc990bdb861e1e09acae72367018472b723f3142a185da0c1fe350c21adb350c48423e577445de0f6e6d68f9d0d84375
+MISC ChangeLog 1876 SHA256 ae7516fd5fea8529f8ba398b10c11c45b4450ae01b530347ee4caaf99ff81128 SHA512 25058b6795d89763f2f3c325e51144b7a08b41fe1a8450a5b5cca68a5943e1825b9baafcb08673ea1102ff2d8adb304fe6d972b0e2941a6d3012b792bb9e85d5 WHIRLPOOL b1fff75a2d2bf62ead9ae3125c6f15c76557649d6af23a64fbbf26175710877f8c74c6c8f0dc7b60bfe0a1be33a5ef68a6918f4879919000e890d819d59ca425
+MISC metadata.xml 850 SHA256 f24a2c7f4d67c520690beace6289da5b74adf5255a2adda96113b605a81eec2e SHA512 ee2e9ebd33e03f3aae6b9bfe1784be17c2e5605376a5971400b4e039a8239fedc6d9c560a6a64b58fb6c143d5b1d2bd67a26455507b901c80fca1b05fdee4b0c WHIRLPOOL 8c307eec1d2c766170f55ddb169437c4f5fd410b7f472dff4062b16c7098795c48f67e7ac8b4ab8598418f4f97384654822c60973b652a3f55f3f3d3498e9693
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlJun2wACgkQ1ycZbhPLE2DGpACeP8Z1bllbKWInI5wg4cXhDCpQ
-WfYAnR3CTVQkQ0HLPhM/Sa83mCKd6yDW
-=GOuL
+iQJ8BAEBCgBmBQJVDC+pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/DUP/AySzw/pcAkSoAvPSzQpeSHm
+bnMSzggNTRDUflG19AdmD3GpMEwm+OOcpaCGHnUBXNEPVyHAMY8YR7Xu8iHLS9Yu
+G0HY+bTZetgADIp4izYJaRG0qqzN8KRFLriwQh4sEqwOKI7pjZJfpuQPmfGI2tMo
+eU7evLN1T6Fo4OunLkgi1T7Mcs2N8Bdde1mZ5UTIl1/ynUpLmDUlS9nc7qfuMOSx
+snHif3IYbNhFXh/IH7z2WkEzqzUUFCfsrrswjG5PgxlcSEoOtGOOOCBsGtxx2uo4
+Qh9oIZfpi55RyODBpOeS2bhQVnzJWudEz1YP9E1uAwx09W/xa5cHu/pSe4v17V9T
+BvPVy0Wnfn9/aO7nmYs1dDgA1JJ1syaZ9XQ9K50PmgIe5znwPipqKdu4BuGcexPL
+7FgcRvndi4t/W84Eu3nFsKT16hp3WElcQ8EWJ/3QH4qmt6WwhLTGoPH48bHeXYhL
+h40gM7J0R9Ccc+Jupkx0Sq/C9N+LRPXgqQF72e7w4fvW84D5SroOHwx4zhqYBW/h
++H4Ufu8LbP3P33473EVccKycTqaC7efJPI+VS55+isXy6/xdQWkksV3Us+cP8aDu
+/3MNO1M+7NhCLF5gs+g4p9DQcxAIFUSXB4F24fbM9V1mQJasGySLRitaOPAFxO0B
+3tIoH5TUilY+dEpejN84
+=VLmj
 -----END PGP SIGNATURE-----
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}"
-- 
2.26.2