Fix tcl/tk slotting; bump EAPI=5

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

4 files changed, 98 insertions, 21 deletions

diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog
index 73e4e7e73520..85e157b0eb09 100644
--- a/app-office/ical/ChangeLog
+++ b/app-office/ical/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/ical
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.36 2013/03/30 15:08:04 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.37 2015/03/20 07:12:52 jlec Exp $
+
+*ical-3.0-r2 (20 Mar 2015)
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> +ical-3.0-r2.ebuild,
+  ical-3.0-r1.ebuild:
+  Fix tcl/tk slotting; bump EAPI=5
 
   30 Mar 2013; Ulrich Müller <ulm@gentoo.org> ical-3.0-r1.ebuild:
   Fix LICENSE, see README and COPYRIGHT files.
diff --git a/app-office/ical/Manifest b/app-office/ical/Manifest
index 1412a36f18ae..4ec4425ba411 100644
--- a/app-office/ical/Manifest
+++ b/app-office/ical/Manifest
@@ -1,24 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ical-3.0-gcc44.patch 329 SHA256 6450b45e18a63a34aaf32c28b55b8f49abed585d8ba8276f5992719b38769821 SHA512 0e956b8b1ade372d6b9bcf7cc772fb637ca818bb05774341f0ab95c5d8bd65fdd9cd81760d7eec4e6d839c0197d95f3872528ece7209d84b9064b5be6c6dcfd2 WHIRLPOOL b0b7b70ba2f36f06d9931df11d58d1e108306bc0fd2e860ba2cf63d2057b1ada16588a098e9dc9a8d8c74c8573f3a39e78938a27ca82080aca20cca7f542bc2e
 AUX ical-3.0-makefile.patch 965 SHA256 25a727b9a4a240f332bba5641c1adbf42d9cdb13efb69406b6322c4aad10b3b5 SHA512 d038708618789b374d0e0e1394018b261e8c309bf718e35880b2ef51b609d4b45b32be203b80d70246f59a041da27a1bd7a5d8392ead0298577860ac864ecd63 WHIRLPOOL 37c87f175367e879df7ba09476a0ecf0ad2e8e6dd9d71f866f770a2467b151dfb7578a8d2d44c15ce187a10938009ad0b44ccdc3ba78914b8b055b5e059208b5
 AUX ical-3.0-newtcl.patch 12767 SHA256 75ff4f6683dc0d913f1bbe694958f1f1d108445e2a25da52eed922380dda9a28 SHA512 14d4603a0639d5500e675944778052b3de6fc7d386e239383eaaee1e51a319a5678f01b96395378de5a69804eddf41be8841566106a04785eb169299c16ebaca WHIRLPOOL 6a8e15576a5f44d1373d51bdfd353df401aaa74784fd9a18fe7457068d418fcffcdc179b57498e2215d8ca216811a5fb53a9aa4b14524355d49e8cf633e2e073
 DIST ical-3.0.tar.gz 373891 SHA256 d290fa484a8fe5e8f70a397e9c12b61bb82c6ca517464390171fe3b06d203bbb SHA512 78cd07a206f4719dfb693b82fda4a735e70dc072fc75bf3885e72f668ebf7fa3511acedd82f99dd3ec366595a8c0ee8a1f13e5dc836732f241ff32d899eb3b25 WHIRLPOOL f702f5f9aaf319a393d60c0e28a43d88970189355f587870eed0adf2504bc6565ee44b508f4bad7971fde6808ec74ca99ecf4db5bf776d2ee919939b5669ce42
-EBUILD ical-3.0-r1.ebuild 1259 SHA256 0e455e6bc76e1561df12f7c85301a85994cf930472e97cf60a255edb27030249 SHA512 f1fb9fda4f24889b0ecd89fc09890a97ff8c0bd25f82f53bd7644510d57e53363ad9ddb87b80c4d6cc27cd9edb84061a9542fa242269964b3da953f89832903c WHIRLPOOL 470741a26d2545ef7b9e8ae3b69ce33f39a6a506518f7df951fe9d2d91b0fd26918f47ccdfd85c2804549a85f8d9b2adb472681783b0302e82f0b6344516798f
-MISC ChangeLog 4521 SHA256 fc764500e9b76ab2b82546b7eb831042ec04abe5458a803ac3945be2dcabcc37 SHA512 c828003455c07aceb4e2901a4a53e155ea2c55f0068b31f4da2ca0446de3daf1dcdd12ba8ecab0d1ed2265c545f7ac947095dcfc102fd84e00a90fc41a653359 WHIRLPOOL 29e60ba9449bbb14394bc3cb9606166f8faf2bc0741a7d40573e7165d0a61fbbf336ba62e555ea7c2a9325ae2d1332f1906105d396a636354e6410d8e16f93d2
+EBUILD ical-3.0-r1.ebuild 1276 SHA256 46fb519ebea262e8577c060e77c56c15cb6bf7fdbcccc83d11621fb3b5d366bf SHA512 2095dc7e24a13d60226ea7b46ac70b43833c64d61583c30aa2cb6b4671eea731c3ffb15d4ca12f2a562db8fd80e8034951280b393a07886ed3d86d33cb32ca6f WHIRLPOOL de5f31e65f526c9afba4c608c58848a053bb07b8f3611941c4f5f5d6935ce186fa2483c718d43274dff7d926a20090f907564dd657817bce85f86c9e5c4d5166
+EBUILD ical-3.0-r2.ebuild 1300 SHA256 1ce6f3333efe3b11d87bad3d5e7f37e47a5943110f7fa84747b3a65a1f5bb762 SHA512 3f34b9580a8ed1ba4a8b31b46273767cee9a3e45de47cd970b6014a5a59ca9a99e605f1572b8648c14cde6bbdd4fc2e6b6159fbc8979ac7abe497cc09a1a1594 WHIRLPOOL e38351c11181e0adcb21d215a3a3d59c8480b0fe9259426306feadf09862888c0df52211c108b49385333f0bcbf7bb87c6f82a63b4c6ca09e7ef01efd508d51e
+MISC ChangeLog 4676 SHA256 b86b18a67c78b18030ecbdefbfc6280e70ce41e942c6248061d5083358ab2fda SHA512 e6d34d4f3d048e5848f49290350fd37815c4266fd2162996fd1a1babd8d79697e4ef63111daa19c6b86b0a5c4dd49c8ec34053ff498b28731a85df2fc8bac5f1 WHIRLPOOL b9a3062a3a470055aca3a17dbd51893a7ee6c913c0d40ca59e1a66611b5b90986298028664197ef9520b403414a336f47dc40ab51814846798dcdfc5a8656176
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJRVv/0AAoJEJQzkH1pP7W4JMoL/itcp23K0D86HQSI9Zc1MVwc
-p50TI+YeVR+bgmSqqRyIgJHORISdIpkfOEfLhJU58TYM1w4kOd2uU5jMYEyPpdo2
-JgX2V6KGz1bETv7qRJm3mYhHSLyCn1qjMpYzxIWBYgfpOatY5UpW0psOAyM+3yAX
-mrkqJOKi7Puer04wPPZD6BGOt7KMFDCFUpL4RYUJB1i3l0Tr2moXzzrb/PbG1z3F
-kvAZOaJUGazq1w5LU2bRJflzXF76640ulpZo281WJB2LkgYwDKqlalzL+PVFvoMo
-+tz0/on1pq2HRKWbsS5/OSPglGj25k60cMxTL738TNgNSoBRKzvkcfjTpKilFaGg
-Kmf88qbWPZXeix0ONC73XPNJ5oXm+RpuhSyE8l40b/+nh6nos9g9InGkbpVLhxJI
-1wIIM37wIQ2d93CClFrI7YA7gAkylpHVfEZU16w/7iKMbuP+2wydDm869d1mumg2
-TAMM1PzweUHSNH9bc4u7hMAtqb+c65GgLdMsp6I0ag==
-=6WVD
+iQJ8BAEBCgBmBQJVC8h1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirkyUP/iZvPFHalk8UyiGCCdiwj+Zh
+J6sBBi5/J4rsfGqdSRKMj7UXHsg/5fkZnAhPANIv9143k6bHfKewwxjWTt5nOOYG
+AdHk1bXnMTAM5FrUZ8pWaELHQmaeOT8VvquOV144yM+03CBioFXxMKaiKflt4WTd
+i3HmCf+/PW9s8VECMaK+UH+5yeI7tsHiO8dgQrRQBpU2WVyIQ/5unBy1Isn3jpJw
+SjFFMaZX5EXhlUw/itxY0NEaqUW8DI+ZxwMyE7cZpUUTWEPVuh1XwKChGECB98sI
+iArmZYjFL3LaVfA+tGC8N4Yxzg3ZiTxxSQ9btBZUcrCRA8pRf2wcQ/2IC8m55W3C
+nHf45eotHLB0YgZ0ls7vGLVrtSHnDw/JSNb7VmdaihLfzDkzn93C3qxj5drEVTcb
+byZqBalM0p8tXXvwuLG2x+WwHz5Pwq9xo1QgJVT8r13FWwcjckmQSFBEB6NFhfaH
+/kwCFmG7f7G+7yQHcLvMdepuch/Muj0ZaSSuanWpM8gA8KcQSs7DH0zahGJPKaZE
+E9of4FqWcwdNywg9UrdvPC+si/b3LrdUyYrAn7V/HQQ60jGyl4j2bwZfGWonzJJJ
+U46halEPnDVcerg7D4QT42rx6XhwA77xYbdRJ3voq7VlwpoWyQ78eWlHwN0qRRqm
+8I3qF0ElJHAmqVWqKIev
+=86Y2
 -----END PGP SIGNATURE-----
diff --git a/app-office/ical/ical-3.0-r1.ebuild b/app-office/ical/ical-3.0-r1.ebuild
index 9af3187bc962..6a7c8a9c6ebf 100644
--- a/app-office/ical/ical-3.0-r1.ebuild
+++ b/app-office/ical/ical-3.0-r1.ebuild
@@ -1,8 +1,9 @@
-# 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/app-office/ical/ical-3.0-r1.ebuild,v 1.7 2013/03/30 15:08:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r1.ebuild,v 1.8 2015/03/20 07:12:52 jlec Exp $
 
 EAPI=3
+
 inherit autotools eutils multilib virtualx
 
 DESCRIPTION="Tk-based Calendar program"
@@ -14,8 +15,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="dev-lang/tcl
-	dev-lang/tk"
+RDEPEND="
+	dev-lang/tcl:0
+	dev-lang/tk:0
+	"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -54,5 +57,5 @@ src_install() {
 	dodoc ANNOUNCE *README RWMJ-release-notes.txt TODO
 	dohtml {.,doc}/*.html
 
-	rm -f "${D}"/usr/$(get_libdir)/ical/v3.0/contrib/README
+	rm -f "${D}"/usr/$(get_libdir)/ical/v3.0/contrib/README || die
 }
diff --git a/app-office/ical/ical-3.0-r2.ebuild b/app-office/ical/ical-3.0-r2.ebuild
new file mode 100644
index 000000000000..18750e6392ab
--- /dev/null
+++ b/app-office/ical/ical-3.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-3.0-r2.ebuild,v 1.1 2015/03/20 07:12:52 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib virtualx
+
+DESCRIPTION="Tk-based Calendar program"
+HOMEPAGE="http://launchpad.net/ical-tcl"
+SRC_URI="http://launchpad.net/ical-tcl/3.x/${PV}/+download/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/tcl:0
+	dev-lang/tk:0
+	"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-newtcl.patch \
+		"${FILESDIR}"/${P}-makefile.patch
+
+	sed -i \
+		-e 's:8.4 8.3:8.6 8.5 8.4 8.3:g' \
+		-e 's:sys/utsname.h limits.h::' \
+		configure.in || die
+
+	sed -i \
+		-e 's:mkdir:mkdir -p:' \
+		-e "/LIBDIR =/s:lib:$(get_libdir):" \
+		-e '/MANDIR =/s:man:share/man:' \
+		Makefile.in || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+}
+
+src_compile() {
+	emake OPTF="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_test() {
+	[[ ${EUID} != 0 ]] && Xemake check
+}
+
+src_install() {
+	emake prefix="${D}/usr" install
+
+	DOCS=( ANNOUNCE *README RWMJ-release-notes.txt TODO )
+	HTML_DOCS=( {.,doc}/*.html )
+	einstalldocs
+
+	rm -f "${D}"/usr/$(get_libdir)/ical/v3.0/contrib/README || die
+}