Upstream distfiles changed layout slightly, adjust ebuilds to match.

Package-Manager: portage-2.1.4.4

4 files changed, 19 insertions, 16 deletions

diff --git a/sys-block/tw_cli/ChangeLog b/sys-block/tw_cli/ChangeLog
index 129f682a2c64..3452712bd1e6 100644
--- a/sys-block/tw_cli/ChangeLog
+++ b/sys-block/tw_cli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/tw_cli
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/ChangeLog,v 1.22 2008/02/26 20:03:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/ChangeLog,v 1.23 2008/02/27 00:39:51 robbat2 Exp $
+
+  27 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> tw_cli-9.4.2.ebuild,
+  tw_cli-9.5.0.ebuild:
+  Upstream distfiles changed layout slightly, adjust ebuilds to match.
 
 *tw_cli-9.5.0 (26 Feb 2008)
 *tw_cli-9.4.2 (26 Feb 2008)
diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
index 3d12c44a797c..50598e7150ad 100644
--- a/sys-block/tw_cli/Manifest
+++ b/sys-block/tw_cli/Manifest
@@ -23,7 +23,7 @@ EBUILD tw_cli-9.3.0.4.ebuild 2033 RMD160 fe44cf168cab7f06f31b5dd2a02c77563d02ab1
 EBUILD tw_cli-9.4.0.1.ebuild 2379 RMD160 a69cc7a8ee4b106106d81de467af647d3e512838 SHA1 4bf631f766f2fb1e45e496c8be4c63fed7c027d2 SHA256 096551b74cf0c529184a941902bf79d41ddf6e2a1af609b05937d7769dc29d23
 EBUILD tw_cli-9.4.0.ebuild 2161 RMD160 0c38c410c8b1acedaeeabc5cbedfd4b0e4b8767d SHA1 f91d3a4d3169b416a719e18d2116c59796b094ae SHA256 49e47a63b40d2726aaa5e2a30ccf24fe0bc4713be24b136bce6d56c3ed6aaf22
 EBUILD tw_cli-9.4.1.2.ebuild 2422 RMD160 c30d7851ab3a50ab49b9dcdd0759b5da6e41a75a SHA1 e69a7d16cb138df5b279d19e683c4f5dc20e4d4e SHA256 b7b695d4a9e72fc0381961d57272baf57dc9f97c9440e14e325363218ffa2c52
-EBUILD tw_cli-9.4.2.ebuild 2425 RMD160 ba49a7fefc1fa21c9fb19b76fa12c7b836b38f36 SHA1 59b0e31c4023577a5b2e953c9a1635a4b8e6c6a6 SHA256 2a7fe60732588fed0385acf03049adc1d2f4e876450ca8bbf21ee00224779e82
-EBUILD tw_cli-9.5.0.ebuild 2505 RMD160 7c012cde8b7ca3d692934718e6432a63bf222176 SHA1 d9b9d97687db8a1bfb366453cb8c6738785f9a2c SHA256 0485b0c9aa3f81540f32795042aab7fe062aea609e6ac4c946f0c9dea875082c
-MISC ChangeLog 4319 RMD160 9371609163d93db7e53b21d17f85be5a7466be82 SHA1 9d0d3e31bbf2838deaf8f38e17d51b98fc71645e SHA256 9c3dd2b9aa31dd0f632eab7106551b86673626f71c07ad76fa3a5ef3999caf5f
+EBUILD tw_cli-9.4.2.ebuild 2410 RMD160 4bc874e6a5814d55d1a1a1eccea64a1588802cee SHA1 0e6d756b7c0c28fa7657677f7484061bb5e5290e SHA256 0d0d48b2e63f471b107c1b6b5ef7791a25ec3b5cadc3d3e3db1a7c925fd567d6
+EBUILD tw_cli-9.5.0.ebuild 2479 RMD160 fd8b7642c0724acddc80b6c07b00cdb1be01b604 SHA1 6d0ad487615be3eacdd7c2f65a625be53e4fa0c8 SHA256 1dd870a645451d87011666caef76beaf5e43fa2797c88e6cb9673af6cb005bfe
+MISC ChangeLog 4488 RMD160 07c08a545584ea2130971822ff28b9f773d05634 SHA1 b82e07ed5779f8f378c0e89e1fdd90586e9466cd SHA256 59ee9ffaa35e3e3e8cc507820c95d9f7ca10584b89dfdd415bd5ab7b444b6236
 MISC metadata.xml 478 RMD160 f5d57054c2548e464973d613d9fba79023dfdcf9 SHA1 0fadc040d60cfd58f2f7310b2cc6e5059cdf0a9c SHA256 6f38854b183db189aac7952ea0f345e2898a4b6d8ff96a1a81c3c305c43c81da
diff --git a/sys-block/tw_cli/tw_cli-9.4.2.ebuild b/sys-block/tw_cli/tw_cli-9.4.2.ebuild
index f66b5d88832e..567e442923e1 100644
--- a/sys-block/tw_cli/tw_cli-9.4.2.ebuild
+++ b/sys-block/tw_cli/tw_cli-9.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/tw_cli-9.4.2.ebuild,v 1.1 2008/02/26 20:03:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/tw_cli-9.4.2.ebuild,v 1.2 2008/02/27 00:39:51 robbat2 Exp $
 
 DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
 HOMEPAGE="http://www.3ware.com/kb/article.aspx?id=14847"
@@ -24,12 +24,12 @@ MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
 HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
 # package has different tarballs for x86 and amd64
 SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI="x86? ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )"
+SRC_URI=""
+for i in x86 amd64 ; do
+	SRC_URI="${SRC_URI} ${i}? ( ${SRC_URI_BASE}/${PN}-linux-${i/amd64/x86_64}-${PV}.tgz )"
+done
 LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
+S="${WORKDIR}/${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
 
 src_unpack() {
 	unpack ${MY_P}.tgz
diff --git a/sys-block/tw_cli/tw_cli-9.5.0.ebuild b/sys-block/tw_cli/tw_cli-9.5.0.ebuild
index c76fe1ed8122..fac61f24f07b 100644
--- a/sys-block/tw_cli/tw_cli-9.5.0.ebuild
+++ b/sys-block/tw_cli/tw_cli-9.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/tw_cli-9.5.0.ebuild,v 1.1 2008/02/26 20:03:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/tw_cli-9.5.0.ebuild,v 1.2 2008/02/27 00:39:51 robbat2 Exp $
 
 DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
 HOMEPAGE="http://www.3ware.com/kb/article.aspx?id=14847"
@@ -25,12 +25,11 @@ MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
 HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
 # package has different tarballs for x86 and amd64
 SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI="x86? ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )"
+for i in x86 amd64 ; do
+	SRC_URI="${SRC_URI} ${i}? ( ${SRC_URI_BASE}/${PN}-linux-${i/amd64/x86_64}-${PV}.tgz )"
+done
 LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
+S="${WORKDIR}/${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
 
 src_unpack() {
 	unpack ${MY_P}.tgz