summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-06-09 10:26:40 +0000
committerJustin Lecher <jlec@gentoo.org>2013-06-09 10:26:40 +0000
commitad8e7afa007b2f906255b137ce40a6799269efc1 (patch)
tree02b5621055c2d7d7a87ccee9fc306ded35c56b25 /dev-tcltk
parentVersion bump to 3.10-rc5 (diff)
downloadhistorical-ad8e7afa007b2f906255b137ce40a6799269efc1.tar.gz
historical-ad8e7afa007b2f906255b137ce40a6799269efc1.tar.bz2
historical-ad8e7afa007b2f906255b137ce40a6799269efc1.zip
dev-tcltk/tklib: Fix file collision by renaming /usr/bin/dia to dia-tklib, #472504
Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64 Manifest-Sign-Key: 0x8009D6F070EB7916
Diffstat (limited to 'dev-tcltk')
-rw-r--r--dev-tcltk/tklib/ChangeLog8
-rw-r--r--dev-tcltk/tklib/Manifest10
-rw-r--r--dev-tcltk/tklib/tklib-0.6-r1.ebuild (renamed from dev-tcltk/tklib/tklib-0.6.ebuild)3
3 files changed, 14 insertions, 7 deletions
diff --git a/dev-tcltk/tklib/ChangeLog b/dev-tcltk/tklib/ChangeLog
index 03851ff15e90..6ea7dc4e3c25 100644
--- a/dev-tcltk/tklib/ChangeLog
+++ b/dev-tcltk/tklib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-tcltk/tklib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/ChangeLog,v 1.3 2013/06/06 08:04:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/ChangeLog,v 1.4 2013/06/09 10:26:38 jlec Exp $
+
+*tklib-0.6-r1 (09 Jun 2013)
+
+ 09 Jun 2013; Justin Lecher <jlec@gentoo.org> -tklib-0.6.ebuild,
+ +tklib-0.6-r1.ebuild:
+ Fix file collision by renaming /usr/bin/dia to dia-tklib, #472504
*tklib-0.6 (06 Jun 2013)
diff --git a/dev-tcltk/tklib/Manifest b/dev-tcltk/tklib/Manifest
index ca37c65a4e52..f11a01c65e58 100644
--- a/dev-tcltk/tklib/Manifest
+++ b/dev-tcltk/tklib/Manifest
@@ -5,13 +5,13 @@ DIST tklib-0.5.tar.bz2 4022413 SHA256 65c0343a6629c98884d9ffd17e87994a3bd54c8361
DIST tklib-0.6.tar.bz2 5637725 SHA256 d2e0648bdaf1ab0f874136f1e5645bd68a8fe206f1905d9f08614d90ee2e3025 SHA512 c4dbe6afe9d1d9c97edc154c807d429086e045f8b202870f21cafcd846b7ff759c8260d44d5e1e1322a0e7d3478c1dfb12d7a0c76200f583ac3bb85b21bf04b4 WHIRLPOOL afeb8f62d58f540eb7ecc99c150c719411a41e585ac09a868896484266e69f85ece4c408bc176d4cc87f123280b584b27b29780e8b9d2f58d22a8dae98b8d5d9
EBUILD tklib-0.5-r1.ebuild 838 SHA256 b830e68eeecd51eb7a09b4f551ea45efd2df1346b26f5f229bf7a0f8043d7af4 SHA512 09446818658069444523f72e9b652d2a5e391ad45e6066bc5abb530645c31d15611fa55a98f23df6de7449bdcdc6ceaad71fb0b5e8ae2b826030ccf335bbb3cc WHIRLPOOL 91e2ea2f467aa9c83a7b7bcce62d5881da5fb3493429afcb3eee3b3dd26f1b3df3b3c47dd437e1283f6e07b6da51cdf4e169fdc7c56c9654934b155c8daa4484
EBUILD tklib-0.5.ebuild 773 SHA256 bf6052776dacfaeafd83d0d6c20a23bd81f2374d31ad76be2d823a49716ff81c SHA512 f3bd414f0d56ad831a7e7c2425b4eaaefb014a5ad2f31d2ccb4a7fc8c72e00a48ddfca28408ab1a3a51e3f0d2328169dafea8726c733da48043f22dcf6376b50 WHIRLPOOL cecb477e0890d8f5b0eb901b0a0c583d0c039ed7f38c32df3bdd22f5881aa50dca49e0691cdf36df6906f868506202ce34590ee7451230bfe93f28a2678596e7
-EBUILD tklib-0.6.ebuild 846 SHA256 e2d3b2d99f2158964a0eb723c665b8aba0a3c1b888e0694fce9c2088a2030006 SHA512 46555bb4da33bafef3803de6f6e20f2af479eae9b56d9804407d8fef6358137f8a99c2c9271e580e3cf575b171788ec8354c01e1455aaf359206d6aae8d8a36d WHIRLPOOL 0d19925af44145aa957702b7862792ca2069a32e8406f6c63513d9e60f4ff6c5ff20250e6f42422234812bb2ba77239942307cf4005eb77d4192e1155d2cbf75
-MISC ChangeLog 663 SHA256 9474c282658865949d19d765068a550071a70a43213a1f319b6a8ed86094676f SHA512 61cc721b3e30dd1ae8c1d2d00e3a8ba791fd7682540ccfc5d89611b6c3def991fb139aa777613460fdb50ce8619c297f50831b767dad4238e5e526a543a747e7 WHIRLPOOL 8ce6d37c5be36648a26bd3522d320f8d0081c280462dafe7037d2d094fb8183bfea1da138cf867cad913a134b4ba1441031d2135a76dd3f267da5bcb1ce2edb1
+EBUILD tklib-0.6-r1.ebuild 889 SHA256 ae3553cc25c179a3f5aaaaaa890b39a51e7201d8ffc328c737cf92bbda1363cd SHA512 8c0cbd8420e4072e5874893a1b7e1f3dad909e204e15d28a144b27f73146a0c54f0fa0e60544f7081aef53647c2001d7b605c26c7650630f869076ddab411afc WHIRLPOOL 9e8f1ea28465e8daeb31eb0c0ffaaf42f371329e1ed37d001d5e6f352ecd801eeee03febff66a1085d1f7098ced6207b3acdbc0fb9c687af8c40ccd369f74edb
+MISC ChangeLog 851 SHA256 bee094474d999a4d2ecffcd4c3196116c2c7801a8ab4a6f351d35b794d7c1e2b SHA512 189895ddd780cb5a6b28facf26750d151e78e36828fea798442267846c7b533a2a901d4bf510a491d530a022bfa05063a2b69e1b919fb851ec00228d0ee36553 WHIRLPOOL 3c7a3307ffabec04a0d1b09e96c01e1a7e206531b742fbb8b4610a78a9211874f44ac33ecf702d52d472f26fb0e3ab34430984bf4ae1a745ab8ca731a9f9fb55
MISC metadata.xml 226 SHA256 e15c03af9a036ecbfee32b0098e8c8327390fe9f5ce3842f524abb860a1714dd SHA512 2be729c67b0770f9b7fe397519d9cc0068cb21e32e42653f3b3ef656bc4dc0d1753877f4984f6f1c886a9e09f447b508e729eaca1ad136bc0f706f09412cadff WHIRLPOOL efa911cc72b3581315ceff377d8ccd23827aa66eaa95c3d97970e7b71228f97045fa37a5b3ad607f36d17e3ac113ec021332b4f1b612894bb01223425d078a47
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREKAAYFAlGwQpsACgkQgAnW8HDreRabnwCaA1vgHHkTupLFMo0CeUzT9uDK
-sUkAoJRcHvl46zb4cIyW4hxaobjKNQpu
-=fxAZ
+iEYEAREKAAYFAlG0WGAACgkQgAnW8HDreRaMlgCcDHeZiEw/dWOfVLlzTSJIWz+M
+EXcAnAlMUdLpAUz7BSUsX0CWfBLl8usM
+=yZDS
-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tklib/tklib-0.6.ebuild b/dev-tcltk/tklib/tklib-0.6-r1.ebuild
index e5e848c0f82c..2a1f9a0acf26 100644
--- a/dev-tcltk/tklib/tklib-0.6.ebuild
+++ b/dev-tcltk/tklib/tklib-0.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/tklib-0.6.ebuild,v 1.1 2013/06/06 08:04:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/tklib-0.6-r1.ebuild,v 1.1 2013/06/09 10:26:39 jlec Exp $
EAPI=5
@@ -32,4 +32,5 @@ src_install() {
dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
+ mv "${ED}"/usr/bin/dia{,-${PN}} || die
}