Fix tcl/tk slotting

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 32 insertions, 84 deletions

diff --git a/net-irc/epic5/ChangeLog b/net-irc/epic5/ChangeLog
index 36c01047acba..adec09470b4d 100644
--- a/net-irc/epic5/ChangeLog
+++ b/net-irc/epic5/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/epic5
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.27 2015/01/26 10:12:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.28 2015/03/25 16:18:58 jlec Exp $
+
+  25 Mar 2015; Justin Lecher <jlec@gentoo.org> -epic5-0.3.5.ebuild,
+  epic5-1.1.10.ebuild:
+  Fix tcl/tk slotting
 
   26 Jan 2015; Agostino Sarubbo <ago@gentoo.org> epic5-1.1.10.ebuild:
   Stable for x86, wrt bug #535570
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index fd1fce714f95..6159a4c85de8 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX epic-defaultserver.patch 610 SHA256 2883f24f8e2d95afc5dd0b3852b8585691c60a47d59aa71a19765301863c4920 SHA512 a7416d269309169a4dd006a5abe7a2a6c6c00d006614388d7a27d071bd06e7dc5a6f4bd35a9c19829b7990babbd1e2c67d1aecf3a767545051f56057cbf20341 WHIRLPOOL b226ff9908f8da263d00f44b6ee8a7b2412f3a70acfb58e70b8086a3f54a9e1cd8ce05db6913a23b5f4b6daa4d83aa042c140b2eeb689f8439f3908c6cb8b024
 AUX epic5-1.1.10-ruby-automagic-as-needed.patch 4139 SHA256 d16b22cb98e5129f15ebdeea746716673af349a5ab0805b6c89c6359f384d44c SHA512 2aa7122a4192849eb3c99c567cc0ad3fb914c4ef17555aecdffeee2b3792f511c3cd43ba069163889705e7a64d04e0636aa0b77934f9605eacfa1ed8d53afa9d WHIRLPOOL f90fe7dbb92fe773f1362af5c1f0328ebfac2e862761f80c32ae54e938b1d05b0f67cc22d1b4a08f0b4956e99da196c9d9d25c437c60d9d892cde994f5a5cbd1
@@ -8,26 +8,26 @@ AUX epic5-1.1.10-tcl-automagic-as-needed.patch 3453 SHA256 60e469a150c04cd720e0e
 AUX epic5-1.1.10-without-localdir.patch 1780 SHA256 487a5614ac4099264e7ef7568858a5d83568cebc8a64d490ecd0597455e99a35 SHA512 788683fe1448793a2d8a5e50dda3dfb0aef86c44cbec11ed0a92444967a1775050bdd3ac40c44989b6fce16a6e7db154aa26d4f4c6692538eca2e661d32af7a6 WHIRLPOOL f95418fde4ae9cc8585b49f8b314d958410dc13287ffa12fffd6720d8d76dd9febceba4ed3dc8ba123884b2f1da21db88d204df75ef8f89c93680241a60614b3
 AUX epic5-1.1.2-libarchive-automagic.patch 1707 SHA256 c04768c6c2fb5dbb5c879d1025cdd6a7d02e7fd3cfc25b081e58e301c2e58439 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c WHIRLPOOL eb60683cc0424e3948bed3227467c8d39f13d6bc1a8e19f907c59595f2620282343b1649301ce35c4a86c8b68170043846d742ccc69eff3a2378fa1d6bc7928d
 AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 SHA256 2bdb85285e83a2ab1f68eb9b43313e9e0695f7de045312dfae4ec7dcdbabd10a SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c WHIRLPOOL 34091febf2784d7cd4ef5deb6485fb17bf32bcedda17e6f899e29da876204d57a6492b8250d2a1631e46aaf1c9c2438b452c7cf3bac005cdb29931f7e70873b4
-DIST epic5-0.3.5.tar.bz2 722469 SHA256 7cdefea991c0b08b16896dd34f3ee2aa190a84f7ee6594527ff9e8185fe881aa SHA512 aae754397bd04f7da9904c378e57eb01fe009d7c7620d2c5547064a1aa84a4abfdc6762336aa9e7a812e92cf890e6a1c85ec55c84ff66dea60fa4b907ea0e04d WHIRLPOOL 144d33ef6c5d32f8fd6a0930ee661ad15d9213022366521d041aa16e1f6b68df2466f40c7651d5f5a8bb966abdc58e9bbe16e9d64c5a3ca48d6ded8295edddaa
 DIST epic5-1.1.10.tar.bz2 851439 SHA256 a4f19214e8eb9a7aceaed62d924d96d8c9359b186ff230c01daff398dd62cdb5 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048 WHIRLPOOL 906b919e99a4bfed78bab153aae3964850be17de958382859547fc34ded75a546714c57c4b1857597fec210359f93a1f6da3b5375a689ac435be381b101ec64a
-EBUILD epic5-0.3.5.ebuild 1336 SHA256 71a1180cbf87ed550ede55a9c41b34b49b726ac4a4aab23967495f654a47a8b3 SHA512 9b4fe08e52237fd5225cd6540abdf35d792c92826bfeca6d2850bf9c31524b80445a74cb7b010e6129cc4b4d42412af63f3cba77c6c896fd42392da7dba53bc3 WHIRLPOOL e9ec7d74681e68744f8242f3b2043db329e87ccad7b4db92bc512aa46c2fc5a81d8b1a7ebe48f1e69a00b31f13fbda54fc6c743422bbb3e50c31764ee1998fc2
-EBUILD epic5-1.1.10.ebuild 2079 SHA256 11c6aa548b9d14c981d0956d1a7105f0ab7d9446e8128d3c197cc6ace97e7643 SHA512 08411902644e58617d13b793b800cc461b191b8ff8cff4ab6c95f80c161d7ffe61c00b601dff0996527b9093b6b8b377f4ee7ca6c9d3d70349a00f0f5bc135df WHIRLPOOL bd421e24783c0cba09c6a2d65b3f5feb2aa5b9c2acdf3530ed53f271337e267454a851e7002e46d3d025d533a3785cdafbc556f862b3ab2563f0c3f936c0bcf0
-MISC ChangeLog 4627 SHA256 747a20c233b1d76fd4cdc931fa62685bd448fa33bfa5c34cb22b69fb08c357b0 SHA512 21b4c7066d236d09564c496aba3ccbd4c144ae2848ed1c410a855828f7504069ca3b4a7e4d37a03eec35f7b788b2b37c368d4198bd40b86215f764d2f6f875ca WHIRLPOOL d5cc857245cf7c081180fcda04fb991ee528cc4db712b794a988c2ff191e5ea17f2133b9a0d738fc95ae71c099fec91b07c830c2b1b59d6be3c54706065eeae9
+EBUILD epic5-1.1.10.ebuild 2069 SHA256 c85f20512df1cde10e85f3513332c42297939dcef1042ebe7eef2c5664d10a6b SHA512 dd942cf60a040e240915a927d6318ed4b2bb1388d77b83eb0cd29f9003733ee3980a6037c52b892e36445be4ff11c216d2e73470b2b247ffc3b53366855c97ef WHIRLPOOL 6857f025fe698ae53e63ee8f2900ea3b604701ba95afec0e91e0477fe9415b7e82388098a67f5e360253ead8402307cacde498919a8032d98330ca106f745033
+MISC ChangeLog 4742 SHA256 9be5a4417bcf7b40c334d781c08fca31b807b0e42ea119b652badcc430ad3faa SHA512 d856f4d3021fa778b54d31ec4355a8eb711f2a503da8c226c8d36b4cfbfc24651430764858bd038bffa4f74aea4bf630638e4cf396a153ca8191ff17c8bba8e3 WHIRLPOOL 656411a396b27a1615d2812b156b103735b4bda248e5d575e629acbc50888372dba6d8f347108fda61f56dc005179e762925a466f1c24d1959093eea7f25f1f2
 MISC metadata.xml 441 SHA256 e20a2146057bc3d5e2e27e659d95b2b2139d8b5c3df752d5efc257a6750cfe3f SHA512 599eeeca94a2f27712b3f1356e9510ff74fb1fbb567dea9cdf97b0f195aeb166bdb6edfa28c6666e1d92e09a685507383ba065f99d8a71e565782d7115575884 WHIRLPOOL 430bce6fe7ee5787510c1fbe4b494f23d413be35f57631b93cae0439608d19140ada145b25d049f126c3f2830922a10be0f5a99521a0665cb0fe1e7082f832f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUxhMgAAoJELp701BxlEWfZisQAJ49Ac+0Udz3J8aE7JkqjDe8
-Mp8ry0ZwgCsvgadMFNuAFXXa1fw0PazVN5fUIXzYeYUmqESbE3xnkniJBnEfl7gr
-BOELl/R+mlbG4j+da++rBufF8tFzt42VBIoo3UnhTHj6iBOKdDYQnl2hALsVxVau
-R+ldjcpN5cNVh6JhktfGaVqFyShYZcrMnXoZsnRUSwMXiTAEYaRSC50oeqDfbDzH
-klGCMue23oyAuXHCDMpCSgcByZGkB65nWmkB8O34VeJ6YN414LZtt9I9ILkFehCf
-POv+SFmNENqYVfh+JJbQC6Dd/cmof3WY8P+GFQ1/KK0O+99JD73dfp44cNtQyG79
-pA/b/I5Byw1VSZGO9HeQ5AfeAX4VB8eAV+4VJXWC83CXmPAr+BRVDzWwMgM+kHKn
-75uZ4ckFuEHcDv1Ap0Xz2Ta7OXaxB+S03cbcvi2YLWlx/Kk5nYhqjq7vrVA1CIV0
-KwhZAmzaJzhS/glu/phBzHoX/kOLbQxjHJmi3er7VVlnEfljKsCf8v8aVRsGJ4Xq
-W5B+HQXZKecc9coIE6gz8CenBbHXBa4nOQ/lF7v2+mLC9zagsH2Ze92Ctj/58yQh
-jPLuyk8PFml8DAGmYiqI3Y9GrL/4IxacnIU3TiPAAnqhtShNUGu1uf/wuLbDBDLU
-65v0tceBuxlaz9QTA5ek
-=XeXH
+iQJ8BAEBCgBmBQJVEt/zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirdxAP/2Frf4nAMqfhwsEy/dbKL7Qy
+Zi9FWGj6ROT4j2v3TNrQdb+iZ5BF3pQdhKJF/2e8mGfuS/pBM7C65t7ybtmM9Umy
+vEKeUhNeeZDyegcVlDtRUEZpFTvqGXVGD8hfawSTNFBPP4r1WmJGe5HWfjWKxTYh
+NMUq4dkDKxrGwa9UNpp1MNB5KUyt+k5LVCzl2tPA+Uh1hegoELGBxFoRQL2OsaJt
+OecfoGv+L/YNDzEZkBgFF3vg95uddptdvdstxmwVVL4yULkHYgUBlvOUHry6TRur
+AzEgr/j+ollDJh68UOeTFxH9W+xXR5UGdI+/Ylc3fDNggRnzgzWb/lD29dDjYP8L
+xWOiy5sIfOe97K/rSzxGsqtc9ZvNqExh1qkSHwuX6kwn0FYkmqO68rLGXAuSJpq/
+Uu5NI9Uz+eVpcEMq4TzsmuZl2CB1ey/iimCwhuwoPcDd53sQrHvwcc3BjOkN9lWm
+wbG+GgnxrFsbpvSpE6mqEtjGTLz7GeL3GFuNR3s2V3oszGOksuuuy+2JPjuC+Iqp
+hMXt8ZvPe+j2+PR513vSdImNi3cSacmNnQCKfLai0JBti7rCNFnvS2ZXeSkoUCHN
+juoMi44HebSsBGVMJsOPbarNsCracveLRGwETUzMJUU1ls5E3us2Qlxlg6UcnvcF
+E26EejRP4iLN1olPhmNn
+=Ielb
 -----END PGP SIGNATURE-----
diff --git a/net-irc/epic5/epic5-0.3.5.ebuild b/net-irc/epic5/epic5-0.3.5.ebuild
deleted file mode 100644
index 8eae2a5b7975..000000000000
--- a/net-irc/epic5/epic5-0.3.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-0.3.5.ebuild,v 1.4 2012/12/23 20:14:47 ulm Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Epic5 IRC Client"
-SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-ALPHA/${P}.tar.bz2"
-HOMEPAGE="http://epicsol.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="ipv6 perl ssl tcl socks5"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	perl? ( >=dev-lang/perl-5.6.1 )
-	ssl? ( >=dev-libs/openssl-0.9.5 )
-	tcl? ( dev-lang/tcl )
-	socks5? ( net-proxy/dante )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/epic-defaultserver.patch
-
-	sed -i \
-		-e 's:/include/tcl$ver:/include:' \
-		-e 's:-lsocks5:-lsocks:' \
-		configure
-}
-
-src_compile() {
-	econf \
-		--libexecdir=/usr/lib/misc \
-		$(use_with ipv6) \
-		$(use_with perl) \
-		$(use_with ssl) \
-		$(use_with tcl tcl) \
-		$(use_with socks5) \
-		|| die "econf failed"
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	einstall \
-		sharedir="${D}"/usr/share \
-		libexecdir="${D}"/usr/lib/misc || die "einstall failed"
-
-	dodoc BUG_FORM COPYRIGHT README KNOWNBUGS VOTES
-
-	cd "${S}"/doc
-	docinto doc
-	dodoc \
-		*.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \
-		nicknames outputhelp SILLINESS TS4
-}
diff --git a/net-irc/epic5/epic5-1.1.10.ebuild b/net-irc/epic5/epic5-1.1.10.ebuild
index 09a589fc2e15..4712f46fdec9 100644
--- a/net-irc/epic5/epic5-1.1.10.ebuild
+++ b/net-irc/epic5/epic5-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.10.ebuild,v 1.5 2015/01/26 10:12:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.10.ebuild,v 1.6 2015/03/25 16:18:58 jlec Exp $
 
 EAPI=4
 
@@ -17,12 +17,13 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
 
-RDEPEND="virtual/libiconv
-	>=dev-libs/openssl-0.9.8e-r3
+RDEPEND="
+	>=dev-libs/openssl-0.9.8e-r3:0
 	>=sys-libs/ncurses-5.6-r2
+	virtual/libiconv
 	archive? ( app-arch/libarchive )
 	perl? ( >=dev-lang/perl-5.8.8-r2 )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:0 )
 	socks5? ( net-proxy/dante )
 	ruby? ( $(ruby_implementations_depend) )"
 DEPEND="${RDEPEND}
@@ -42,7 +43,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
 		"${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
 		"${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
 		"${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
@@ -69,7 +71,7 @@ src_compile() {
 }
 
 src_install () {
-	emake DESTDIR="${D}" install
+	default
 
 	dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES