Move uncompress to /bin so we dont conflict with app-arch/ncompress #165608 by barthek.

Package-Manager: portage-2.1.2-r8

3 files changed, 18 insertions, 15 deletions

diff --git a/app-arch/gzip/ChangeLog b/app-arch/gzip/ChangeLog
index 94a1d4883156..e66533fee95f 100644
--- a/app-arch/gzip/ChangeLog
+++ b/app-arch/gzip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/gzip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.75 2007/02/06 01:15:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.76 2007/02/06 13:34:07 vapier Exp $
+
+  06 Feb 2007; Mike Frysinger <vapier@gentoo.org> gzip-1.3.11.ebuild:
+  Move uncompress to /bin so we dont conflict with app-arch/ncompress #165608
+  by barthek.
 
 *gzip-1.3.11 (06 Feb 2007)
 
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 232ccf78df37..1b6ab67c1d01 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -65,10 +65,10 @@ EBUILD gzip-1.3.10.ebuild 1285 RMD160 ce0cb568b3f37a2abad43301a8a61ec83039db8b S
 MD5 1c3ad72d034eba4e0ae6bbf74397f8cf gzip-1.3.10.ebuild 1285
 RMD160 ce0cb568b3f37a2abad43301a8a61ec83039db8b gzip-1.3.10.ebuild 1285
 SHA256 c6d0ce4d5a1dad6d2443c3ab0cf1e33b33bb74e8b2405da0c83db8bdaa25beb0 gzip-1.3.10.ebuild 1285
-EBUILD gzip-1.3.11.ebuild 1285 RMD160 1dd179b1f40f2c657944bd64db6f97919aba555e SHA1 553a23199db84c16aba9cf063b465f2b46546882 SHA256 abcedbb88ef5912362da2ec0d0aaa13f99930a8c3813e0991d0d15cd916d04db
-MD5 608636ee9835cf9820e72f5e8b569e88 gzip-1.3.11.ebuild 1285
-RMD160 1dd179b1f40f2c657944bd64db6f97919aba555e gzip-1.3.11.ebuild 1285
-SHA256 abcedbb88ef5912362da2ec0d0aaa13f99930a8c3813e0991d0d15cd916d04db gzip-1.3.11.ebuild 1285
+EBUILD gzip-1.3.11.ebuild 1254 RMD160 33122e3d54f90eeed46f12ad421613fac350300c SHA1 3007e5d43c873f80bca8c3b71f768bd5a21f8427 SHA256 37e08438053334d86327e0372e55c9be79902432d66ac0dd7d94d505d405707a
+MD5 82c0ce6cc3b7b6e2ac37ff2ed304e42a gzip-1.3.11.ebuild 1254
+RMD160 33122e3d54f90eeed46f12ad421613fac350300c gzip-1.3.11.ebuild 1254
+SHA256 37e08438053334d86327e0372e55c9be79902432d66ac0dd7d94d505d405707a gzip-1.3.11.ebuild 1254
 EBUILD gzip-1.3.5-r10.ebuild 2294 RMD160 0b3defcaf0074ac2b5fa267a053ff09096c9bf3b SHA1 1550cfeb77ee422a0ff53b549800223f7b3b20d4 SHA256 156570acad172ec81c3b5a6333d4450f7f181816b5c532a7611835b029450363
 MD5 cc4c34723038148c3a048ea6f0c4ff86 gzip-1.3.5-r10.ebuild 2294
 RMD160 0b3defcaf0074ac2b5fa267a053ff09096c9bf3b gzip-1.3.5-r10.ebuild 2294
@@ -77,10 +77,10 @@ EBUILD gzip-1.3.9.ebuild 1242 RMD160 9d56052ed4b439690919c65c4f391075098b510e SH
 MD5 803c24245e75b87bdb42dc12ce5cb43b gzip-1.3.9.ebuild 1242
 RMD160 9d56052ed4b439690919c65c4f391075098b510e gzip-1.3.9.ebuild 1242
 SHA256 183e4823462933d0800f70da052f06203cecdccc819e49076aaa2c4465aa355f gzip-1.3.9.ebuild 1242
-MISC ChangeLog 12049 RMD160 d86c45f06fc90dbb8b13b4c2514d4cadd8667cf4 SHA1 d1d4c2073a0001abbba9911f666facdd29f092f0 SHA256 cc207b2473c9d0ade864a7603e25af62affba766930e8dff1faee325369e5ee8
-MD5 b0c5c821dfd005d7870619264b2f29d2 ChangeLog 12049
-RMD160 d86c45f06fc90dbb8b13b4c2514d4cadd8667cf4 ChangeLog 12049
-SHA256 cc207b2473c9d0ade864a7603e25af62affba766930e8dff1faee325369e5ee8 ChangeLog 12049
+MISC ChangeLog 12212 RMD160 d4ea415420c66d6e078b99e0fcbb1355e5649589 SHA1 e61beac6576d1e3465242a64e8cd56bbdba30d93 SHA256 d7d5584207ea43b2308a0b8a83485fd2e9876a2fd37001d146b0850240df942e
+MD5 03428a0a24d378590b00bc57f068e56d ChangeLog 12212
+RMD160 d4ea415420c66d6e078b99e0fcbb1355e5649589 ChangeLog 12212
+SHA256 d7d5584207ea43b2308a0b8a83485fd2e9876a2fd37001d146b0850240df942e ChangeLog 12212
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -100,7 +100,7 @@ SHA256 1bfb2b9f55c853dc6ffcd0d86f86f43afd06e1091eb77b31cb5463ffe940496e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFx9bJ8bi6rjpTunYRAoVzAJ9gCcqAzGiKicXcmH52wVTZg48zVgCfeA1W
-b+Rja/mBbZzW0yS/owcT0iU=
-=BqNX
+iD8DBQFFyIPw8bi6rjpTunYRAkkrAKC0Ll3SEJ7dEQYoWaA+A3NI0xxFBgCgxGbs
+CqdeWgRPrWMM/QC+UeBnAgs=
+=Hx1d
 -----END PGP SIGNATURE-----
diff --git a/app-arch/gzip/gzip-1.3.11.ebuild b/app-arch/gzip/gzip-1.3.11.ebuild
index cbec7fead8cf..0c1371965a20 100644
--- a/app-arch/gzip/gzip-1.3.11.ebuild
+++ b/app-arch/gzip/gzip-1.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.11.ebuild,v 1.1 2007/02/06 01:15:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.11.ebuild,v 1.2 2007/02/06 13:34:07 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -43,6 +43,5 @@ src_install() {
 
 	# keep most things in /usr, just the fun stuff in /
 	dodir /bin
-	mv "${D}"/usr/bin/{gunzip,gzip,zcat} "${D}"/bin/ || die
-	dosym /bin/gunzip /usr/bin/gunzip || die
+	mv "${D}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${D}"/bin/ || die
 }