Fix LICENSE from "as-is" to "all-rights-reserved" and RESTRICT "bindist" wrt #444426#c4 by Ulrich Müller

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 27 insertions, 30 deletions

diff --git a/app-crypt/rainbowcrack/ChangeLog b/app-crypt/rainbowcrack/ChangeLog
index ec8464f4aa5e..9c3ee393bfc8 100644
--- a/app-crypt/rainbowcrack/ChangeLog
+++ b/app-crypt/rainbowcrack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/rainbowcrack
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.22 2012/09/24 00:41:55 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.23 2013/05/27 10:35:15 ssuominen Exp $
+
+  27 May 2013; Samuli Suominen <ssuominen@gentoo.org> rainbowcrack-1.5.ebuild:
+  Fix LICENSE from "as-is" to "all-rights-reserved" and RESTRICT "bindist" wrt
+  #444426#c4 by Ulrich Müller
 
   24 Sep 2012; Mike Frysinger <vapier@gentoo.org> rainbowcrack-1.2-r1.ebuild,
   rainbowcrack-1.2-r2.ebuild, rainbowcrack-1.5.ebuild:
diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest
index 6d22d40e6ab9..2a60506c719d 100644
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@@ -14,23 +14,17 @@ DIST rainbowcrack-1.5-linux32.zip 120118 SHA256 b1485f9131ee3a03006e269f674135a0
 DIST rainbowcrack-1.5-linux64.zip 118000 SHA256 ebeaa84f01fd69e67670af47472f98e5d1c8b6b70f9590009b13956e859c4b5e SHA512 dd41ce2dd5a8209b445f0ee578892ab1236f7cc7a1a4404ab0e6c7eed0cc20168e039a063b08350d2ae42a25a9b6f7dd57c12fad7d480c302e28035f2582289e WHIRLPOOL 28259a3ef78d9d26b3cb0abcccf9d6efc05b999c38abcf5690b1b0fb9edf019a8c94d6f3ad6afe8c385fb92def3348bae214ecd57e0b70ef52edbc4138aef177
 EBUILD rainbowcrack-1.2-r1.ebuild 2025 SHA256 f12e5151999f1f032bfe1754c22def7ba741e83ec91137c5ab6c4b79614f8402 SHA512 190b2d4242ba9ea66f866a3f6230aaa1628b612b3ba3f97bd4a23a90162da1e86e8a34d4d8ecdb2612b9529955e68a38b0e7919a0999134826787ba4929d5815 WHIRLPOOL 75cdbe06f6b278591b80f8fc19fb587c8d4dc16ea975b1f0ff1810f7cf4901ec7d569d5d51ddd19f8129992062f36523e750077b7a4c8d4dc2464c68fcf3d224
 EBUILD rainbowcrack-1.2-r2.ebuild 1997 SHA256 f7eb77ccde562561d622822e678f81f98ce64d843bac3e76b6ed8f19eb4b377e SHA512 01c2220e5107f4062f0491f3919a142db0446674c9d3f86874541c5c7d45c30725f887a54a470d2f3a58cdc027e88f036d673b935d3a6db576a3ce3313f51475 WHIRLPOOL ca60ba279e79321f52e17c649c781e965bc788cfa3752a066e8c1c154a3f769851d09da959ea4f3c7876931e9f2d681d94b831fa0612664e30c407808b0d218b
-EBUILD rainbowcrack-1.5.ebuild 1119 SHA256 de764bd5e87aa3b28a05936657b3e6a3d04a36974ddd889a21b2ad0a69faaa2a SHA512 bea7568b62af11be91a93776deabaf4ac58665a1eef6ae2fa8b8fe127769de09af86117893bc4331c61ddaf4d65ab06d2f5119afbc7fc2004e57220120ab071b WHIRLPOOL 281b87b7e52d31b5d73e916fceca47d32ea16fc94822dff3b4d18edef24d59b60a3889a2a68ff9d158d6e0b9e5afe5c141854ce930c9d7d207e5bc76a052d3b2
-MISC ChangeLog 3364 SHA256 31782719de607e7abf28f35c3bfd08a3ed045b02bdbaaf969b018ee85f311592 SHA512 d8e26d52c3373652777ff3022896ee1acbcfe0dbc1488a70341bfe57ac9319686b76aef23d5657d172e95b91e0dd187cbb623c95f497f5551b1456129d8c329b WHIRLPOOL 5e229480f728c71865c7c6f9a35176efb70e3c54f161ce2261a1071fd91610af5d9b3475638450087565658ee7c6515f895bfa3a33f5a6811b22e1eb98c9d5a6
+EBUILD rainbowcrack-1.5.ebuild 1096 SHA256 2ea80167a43a259d8f8534287e91ca57f3180281008e49af8e50a197ed01f43c SHA512 63a76d7bb38a110ab425492bba4bc8fd25f102693fc2fc0edf5552c576687ba896ee2a38851a6edfb102472275d84d289322d57a184ffeaef2b7401ef96dfc84 WHIRLPOOL 54aff435970c3ba8e63d0474bbc5d575b9f0d77495ec5c76bac32f2ac238f689ddf5d4d00105955921fe9a0a2565063f3eae7f2ba1a8b13a6ead9073725c8ce8
+MISC ChangeLog 3557 SHA256 6fe53243b2e43c18970e614c2402eab49d747a80f903cfe6539b99ac3366ba29 SHA512 c2e380f54762a79ccdf8cc22f1498fda6d53eedcc93da8c66461a73ee92d7f0ffe8286e19dc293dc7945e029ca3d3eb6d7377097c7eb8c7a946dfef8ad3d5207 WHIRLPOOL 6d34a5652249d250eaa93f7287283f9154ec693702de85dc4420b379952b29ffa253cc32847af0714648739b5292182fadaf94afca30b87ad23957c1f64ed428
 MISC metadata.xml 891 SHA256 32fc72b39f119211ee5e38dd405620e1c3b17b923f848692a10de230c3a336c7 SHA512 58676b48b62098cfb3efd97cc0a47b319e9e4c21aff3eb4e6c9002838ad4fa3238ff7a4bff08e808e16db1e6cfc16a25d356885999d2e27c8ece49f3a40e8382 WHIRLPOOL 91491dd76c3eb291d9d11572e1b96c87a5aa413eea471a5fe4574fc60214f06e278e55e312b18dd09ae9bd52b4cc5ff0d405f043bd6121baf2db9a5563d0115b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQX6xaAAoJELEHsLL7fEFWCOMP/2kp7nExl5ipxBN6e0cRkqXk
-uOsIdKtiMLKsoU4/hbSxUyhzd7gyLNQMXpH4YjpjYu/HJXfkgY6sPHFL6nA3glR/
-pvY1Xk4o6vP+VPU6cC5IOunNd412AlUJyo0DafxZ1vTKlgIm25jlk5DYab6KNVM/
-Mh2agyBts3dp3hFF/FWK9xELjq23bcXlrF1YG2Bsn3LMrKGrjr/UqDFmROYKXD5q
-YL6gzHKO3RSmlFYJzgq1ljzscA96dyZrqUq7jbZrOzADQygnobasc63GsEoBeOxA
-hZmFGTGMZ79LKeMMT5BG1qThceMLgHqODrXQFXyVp34AOx1M51mPORkFm9b/+pwF
-92MfVfYlQMSrFnzm7nmbSOKNnqimV75aPXaTb+R0E5m7dBEKJZPIRh+Icnf9czrw
-CsAYxQf3h0bR3lL4LvOx0HatwNkbjW3xUAGHKjPC0zHWziYcN6fZbPHys9Uepcb6
-aMCPaforZ3RrSU16dmmAzHgPV4E8FIe+cyWmj68nwQQyls993rDKdW4efH2O6fh3
-KOkmzbBlsccLPBjdR/3phnrvy5w9DcyCYp59NfquqvAh2VopGoFViNdsnePtnsZg
-UsVB5ayx7MMnQRB9A3ezYZk6MOMe5SOSe/ZzJF/LOJy8miWYyM0QhRljqLsN495X
-gB6nYkzLi+8QS9HjHkTe
-=50ja
+iQEcBAEBCAAGBQJRozZnAAoJEEdUh39IaPFNOSEH/joS1R1DsF2CVnBjgIdvTYkI
+TYhXjhhiEpMXb8NyOK/jwZ/v2K8ZG2pVzZEvV/h4LH97UMCCNEdYh3vPAOdtlfaQ
+RW7QakrgDyGaKJtvburIAZHCOkWtPZ7r17Hk+n4bl13PkVaj7C5Y1Zr2YEETFQbr
+hMxBj0y1febEp5de+siVdM9c8A/q6NBhGoXmdGWH3Pk7ViZOBu9QMPEca4vpQmdI
+Rek6UGZhtMQrU8aGqHPPy7Z8BbklP9EPJ/h5Kj7WmQLaKFxPXo/UEQC9Vrr2TnPl
+ubAw+sAQYoSOXBC/0bvsVkWA/bLfY1aM5L+cYsY2XwQ646huTYkiz2Xb957V5x4=
+=eQTE
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.5.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.5.ebuild
index a191893870c7..18a4d15d1e8a 100644
--- a/app-crypt/rainbowcrack/rainbowcrack-1.5.ebuild
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/rainbowcrack-1.5.ebuild,v 1.2 2012/09/24 00:41:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/rainbowcrack-1.5.ebuild,v 1.3 2013/05/27 10:35:15 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils
 
 DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
@@ -10,21 +10,20 @@ HOMEPAGE="http://project-rainbowcrack.com/"
 SRC_URI="amd64? ( http://project-${PN}.com/${P}-linux64.zip )
 	x86? ( http://project-${PN}.com/${P}-linux32.zip )"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-RESTRICT="mirror" # http://bugs.gentoo.org/show_bug.cgi?id=312497#c8
+RESTRICT="bindist mirror" #444426
 
 RAINBOW_DESTDIR="opt/${PN}"
 
 QA_FLAGS_IGNORED="${RAINBOW_DESTDIR}/.*"
 QA_PRESTRIPPED="${RAINBOW_DESTDIR}/.*"
 
+DEPEND="app-arch/unzip"
+
 src_unpack() {
 	unpack ${A}
 	mv ${P}-linux* "${S}"
@@ -33,14 +32,14 @@ src_unpack() {
 src_install() {
 	local bin bins="rcrack rt2rtc rtc2rt rtgen rtsort"
 
-	exeinto /${RAINBOW_DESTDIR}
+	exeinto "/${RAINBOW_DESTDIR}"
 	doexe alglib0.so ${bins}
 
 	for bin in ${bins}; do
-		make_wrapper ${bin} ./${bin} /${RAINBOW_DESTDIR} /${RAINBOW_DESTDIR}
+		make_wrapper ${bin} ./${bin} "/${RAINBOW_DESTDIR}" "/${RAINBOW_DESTDIR}"
 	done
 
-	insinto /${RAINBOW_DESTDIR}
+	insinto "/${RAINBOW_DESTDIR}"
 	doins charset.txt
 
 	dodoc readme.txt