fixed conditional dependency on unzip (needed unconditionally, as docs are zipped and listed in SRC_URI, #206033)

Package-Manager: portage-2.1.4

4 files changed, 42 insertions, 38 deletions

diff --git a/dev-ada/booch_components/ChangeLog b/dev-ada/booch_components/ChangeLog
index a7719bb7565b..404374a7541e 100644
--- a/dev-ada/booch_components/ChangeLog
+++ b/dev-ada/booch_components/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ada/booch_components
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/ChangeLog,v 1.15 2007/05/31 14:47:41 george Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/ChangeLog,v 1.16 2008/01/20 21:53:16 george Exp $
+
+  20 Jan 2008; George Shapovalov <george@gentoo.org>
+  booch_components-20051222-r1.ebuild, booch_components-20070420.ebuild:
+  fixed conditional dependency on unzip (needed unconditionally, as docs are
+  zipped and listed in SRC_URI, #206033)
 
 *booch_components-20070420 (31 May 2007)
 
diff --git a/dev-ada/booch_components/Manifest b/dev-ada/booch_components/Manifest
index 04d8b7a0ef28..e5dc75f0005a 100644
--- a/dev-ada/booch_components/Manifest
+++ b/dev-ada/booch_components/Manifest
@@ -2,22 +2,22 @@ DIST bc-20051222.tgz 181962 RMD160 c3a12233058208104b7ef71ee041aad872f71da9 SHA1
 DIST bc-20070420.tgz 183645 RMD160 b8d2cc9c6fc3417871ee407eeb352051f29f0c42 SHA1 1242f30f537978c17ab1abeb2902e5fefe052810 SHA256 09eb43fa318c354ef5dc57c25faaa0d472fedc7b26215e14914e611a483686bb
 DIST bc-html-20051222.zip 59373 RMD160 61268baf6fb20172b989e0ad8807ce733e8588e7 SHA1 46e2e7a0a79584daf60bc4acd2682d1edeaad51e SHA256 1f92a74fb2427af92c28a4dacc5d02b515a6ae1a783a354efb8b9b2f11b85dd4
 DIST bc-html-20070420.zip 60500 RMD160 602116e24c05c3604c14f16df2d9e4d55f64fddc SHA1 dfc137b17fbba62aac4ce808d3cab00a00812c47 SHA256 049c5edbe8c54cb632807488deb5d2782923b934afde16b565dcb7bab79629da
-EBUILD booch_components-20051222-r1.ebuild 2131 RMD160 59cd552ce809652173dc66d58f66e7dd2e097230 SHA1 4d251bf29f961eae9cc6a346a0906d841d54f660 SHA256 be2f1862088c2637ca6d718a14cdf43078bdfe9fd3470d9a0629c4f2c968cf3b
-MD5 1147cf2ccec1321a0ed840d64e98a9fc booch_components-20051222-r1.ebuild 2131
-RMD160 59cd552ce809652173dc66d58f66e7dd2e097230 booch_components-20051222-r1.ebuild 2131
-SHA256 be2f1862088c2637ca6d718a14cdf43078bdfe9fd3470d9a0629c4f2c968cf3b booch_components-20051222-r1.ebuild 2131
+EBUILD booch_components-20051222-r1.ebuild 2129 RMD160 41a6f80a9bc2bdbda388e55ed60bdc41226b7d43 SHA1 87b0deb3710d7dbde1ca679c569847a83ff38292 SHA256 255fdd1ac2dd95fee0e72013a2322bd131b30c86bfbf455df365d71f6f6f4b45
+MD5 ee09b162ac8a38df3eb744edf3efd630 booch_components-20051222-r1.ebuild 2129
+RMD160 41a6f80a9bc2bdbda388e55ed60bdc41226b7d43 booch_components-20051222-r1.ebuild 2129
+SHA256 255fdd1ac2dd95fee0e72013a2322bd131b30c86bfbf455df365d71f6f6f4b45 booch_components-20051222-r1.ebuild 2129
 EBUILD booch_components-20051222.ebuild 2095 RMD160 e4374d9fa0c42fa05e89c09e7c44cb92024b61bb SHA1 04fbf4a6635ece46bee90a464740932e1be0ecdb SHA256 a44dbdae048666963ea21f0094a7e3f929b3c4da5ec563b2ae8cf589de73a445
 MD5 a1c684b160468f400a2d3aea3deda3ce booch_components-20051222.ebuild 2095
 RMD160 e4374d9fa0c42fa05e89c09e7c44cb92024b61bb booch_components-20051222.ebuild 2095
 SHA256 a44dbdae048666963ea21f0094a7e3f929b3c4da5ec563b2ae8cf589de73a445 booch_components-20051222.ebuild 2095
-EBUILD booch_components-20070420.ebuild 1492 RMD160 cbf7e85410ab0a160c4b475a83616de4dd836ff6 SHA1 4724114fc554cd1f55a04636456567d4ea5356a6 SHA256 4b58e8d3fc630133df7a21a2e8f9c025f5a83fdde7806f7db35d94822f18bb55
-MD5 fad076773ef7a4defe71686c4c7c3046 booch_components-20070420.ebuild 1492
-RMD160 cbf7e85410ab0a160c4b475a83616de4dd836ff6 booch_components-20070420.ebuild 1492
-SHA256 4b58e8d3fc630133df7a21a2e8f9c025f5a83fdde7806f7db35d94822f18bb55 booch_components-20070420.ebuild 1492
-MISC ChangeLog 2549 RMD160 06756068008482bccaf6cec42c0b482e182cca3f SHA1 648414d4d5892e8f6c42e0a34a6b4f98f6471f12 SHA256 3c6cb4f66d7101b19fda196b147bb3f9195f48ca6ad8a633940d8f5b4d6c8ede
-MD5 ff026792dcf890f42ffbb14470d11871 ChangeLog 2549
-RMD160 06756068008482bccaf6cec42c0b482e182cca3f ChangeLog 2549
-SHA256 3c6cb4f66d7101b19fda196b147bb3f9195f48ca6ad8a633940d8f5b4d6c8ede ChangeLog 2549
+EBUILD booch_components-20070420.ebuild 1488 RMD160 2f31ba967430a8bda5563b0f8ea18ce951669c34 SHA1 7e759d556665e3f781d701f4b0d47015ed3e9088 SHA256 05145c9cd6481c815f0e40073654fd776bdc5d604f4b4c33a991ec49d8f0d216
+MD5 682528d880be1552405a44b1e5cfe4ff booch_components-20070420.ebuild 1488
+RMD160 2f31ba967430a8bda5563b0f8ea18ce951669c34 booch_components-20070420.ebuild 1488
+SHA256 05145c9cd6481c815f0e40073654fd776bdc5d604f4b4c33a991ec49d8f0d216 booch_components-20070420.ebuild 1488
+MISC ChangeLog 2794 RMD160 97b49b18b4bd1de0ce0e713f745f7eb1f46d89d3 SHA1 14f84aece0a96c010e5fb8f87384f782f82744df SHA256 d194e9e5e6e1dad9e0527ca3404cf7b53a25cfa683af7055168dfe5ba09ad911
+MD5 4d33737c109d52914d02cfae6b7aa840 ChangeLog 2794
+RMD160 97b49b18b4bd1de0ce0e713f745f7eb1f46d89d3 ChangeLog 2794
+SHA256 d194e9e5e6e1dad9e0527ca3404cf7b53a25cfa683af7055168dfe5ba09ad911 ChangeLog 2794
 MISC metadata.xml 479 RMD160 8a0ab90894f28051aa41f47888aca8c0041505e7 SHA1 cd274ca67961d65b0b5be7af14a7b2930d3d6d48 SHA256 b527c9c5bdc79983b69afc98394b9d79fa3c5d7457cce03748a95be032dab708
 MD5 e544234de998b5b8db36dbc1bfce8807 metadata.xml 479
 RMD160 8a0ab90894f28051aa41f47888aca8c0041505e7 metadata.xml 479
diff --git a/dev-ada/booch_components/booch_components-20051222-r1.ebuild b/dev-ada/booch_components/booch_components-20051222-r1.ebuild
index aa443b69e01f..37e06a0c9aff 100644
--- a/dev-ada/booch_components/booch_components-20051222-r1.ebuild
+++ b/dev-ada/booch_components/booch_components-20051222-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/booch_components-20051222-r1.ebuild,v 1.5 2007/06/26 01:44:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/booch_components-20051222-r1.ebuild,v 1.6 2008/01/20 21:53:16 george Exp $
 
 IUSE="doc"
 
@@ -22,7 +22,7 @@ RDEPEND="virtual/gnat
 	>=app-admin/eselect-gnat-0.7"
 
 DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
+	app-arch/unzip"
 
 lib_compile() {
 	cd ${SL}/GNAT
@@ -32,17 +32,17 @@ lib_compile() {
 lib_install() {
 	# new style booch components install Debug and Release versions, we only
 	# need the lib subdir of either
-	mkdir -p ${DL}/Debug
+	mkdir -p "${DL}"/Debug
 	# both $SL and $DL are under ${WORKDIR}, so no dodir, doins...
 	# (as lib_install is  called from src_compile it is not safe to have $DL
 	# under $D)
-	mv ${SL}/GNAT/*-Release/lib/* ${DL}
-	mv ${SL}/GNAT/*-Debug/lib/* ${DL}/Debug
+	mv "${SL}"/GNAT/*-Release/lib/* "${DL}"
+	mv "${SL}"/GNAT/*-Debug/lib/* "${DL}"/Debug
 }
 
 src_install () {
 	dodir "${AdalibSpecsDir}/${PN}"
-	cd ${S}
+	cd "${S}"
 	insinto "${AdalibSpecsDir}/${PN}"
 	doins *.ad?
 
@@ -54,14 +54,14 @@ src_install () {
 	gnat_src_install
 
 	# Install documentation.
-	dodoc COPYING README
+	dodoc README
 	if use doc ; then
 		einfo "installing docs"
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		dohtml *.html *.gif *.jpg
-		cp coldframe-hash.* x.ada ${D}/usr/share/doc/${PF}/html
+		cp coldframe-hash.* x.ada "${D}"/usr/share/doc/${PF}/html
 
-		cd ${S}
+		cd "${S}"
 		dodir /usr/share/doc/${PF}/demo
 		insinto /usr/share/doc/${PF}/demo
 		doins demo/*
diff --git a/dev-ada/booch_components/booch_components-20070420.ebuild b/dev-ada/booch_components/booch_components-20070420.ebuild
index f7a080524c17..3ab164cae4cb 100644
--- a/dev-ada/booch_components/booch_components-20070420.ebuild
+++ b/dev-ada/booch_components/booch_components-20070420.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/booch_components-20070420.ebuild,v 1.1 2007/05/31 14:47:41 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/booch_components/booch_components-20070420.ebuild,v 1.2 2008/01/20 21:53:16 george Exp $
 
 IUSE="doc"
 
@@ -21,22 +21,21 @@ SLOT="0"
 RDEPEND="virtual/gnat"
 
 DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
+	app-arch/unzip"
 
 lib_compile() {
-	cd ${SL}/GNAT
+	cd "${SL}"/GNAT
 	make
 }
 
 lib_install() {
-	mkdir -p ${DL}/Debug
-	mv ${SL}/GNAT/*-Release/lib/* ${DL}
-	mv ${SL}/GNAT/*-Debug/lib/* ${DL}/Debug
-	chmod 0444 ${DL}/*.ali ${DL}/Debug/*.ali
+	mkdir -p "${DL}"/Debug
+	mv "${SL}"/GNAT/*-Release/lib/* "${DL}"
+	mv "${SL}"/GNAT/*-Debug/lib/* "${DL}"/Debug
+	chmod 0444 "${DL}"/*.ali "${DL}"/Debug/*.ali
 }
 
 src_install () {
-	cd ${S}
 	dodir "${AdalibSpecsDir}/${PN}"
 	insinto "${AdalibSpecsDir}/${PN}"
 	doins *.ad?
@@ -49,14 +48,14 @@ src_install () {
 	gnat_src_install
 
 	# Install documentation.
-	dodoc COPYING README
+	dodoc README
 	if use doc ; then
 		einfo "installing docs"
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		dohtml *.html *.gif *.jpg
-		cp coldframe-hash.* x.ada ${D}/usr/share/doc/${PF}/html
+		cp coldframe-hash.* x.ada "${D}"/usr/share/doc/${PF}/html
 
-		cd ${S}
+		cd "${S}"
 		dodir /usr/share/doc/${PF}/demo
 		insinto /usr/share/doc/${PF}/demo
 		doins demo/*