Version bump. Change the RESTRICT=fetch to primaryuri, and let upstream count the downloads that way. Also update my test list as some of that hardware is long gone.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

3 files changed, 119 insertions, 2 deletions

diff --git a/sys-block/tw_cli/ChangeLog b/sys-block/tw_cli/ChangeLog
index 30a2d9e3921b..b4ef92bec1bd 100644
--- a/sys-block/tw_cli/ChangeLog
+++ b/sys-block/tw_cli/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/tw_cli
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/ChangeLog,v 1.32 2010/06/18 06:47:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/ChangeLog,v 1.33 2010/11/15 22:02:51 robbat2 Exp $
+
+*tw_cli-10.2 (15 Nov 2010)
+
+  15 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> +tw_cli-10.2.ebuild:
+  Version bump. Change the RESTRICT=fetch to primaryuri, and let upstream
+  count the downloads that way. Also update my test list as some of that
+  hardware is long gone.
 
 *tw_cli-10.1 (18 Jun 2010)
 
diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
index 7b26773f4b01..0335503dc30b 100644
--- a/sys-block/tw_cli/Manifest
+++ b/sys-block/tw_cli/Manifest
@@ -1,5 +1,7 @@
 DIST cli_freebsd_10.1.zip 1500092 RMD160 b00fe93224b579ca8c24ba885ab4761a0ecb12ea SHA1 e61612f88a9f7515cb1d2136f799f3075395488c SHA256 f5f0eaf4ae90ec67837fa42e4e94a3f97b0b8a7b3efd88e980761c270f96fd85
+DIST cli_freebsd_10.2.zip 1467421 RMD160 7ea44092477e69f5af17a4198d6c4d4448e28aed SHA1 de5f3c99ceef6e8287dd9df8a37e4b842b999e0f SHA256 73ea166d2e569e8d9d3ecc8069fd4d6a06b1fedb9b56607360b93f393e8029b5
 DIST cli_linux_10.1.zip 1845534 RMD160 2b8af61ddfdba2779386264c9fff8c4b67c475e3 SHA1 c856c99e64e38ba505b3da2139295d07f9aca45b SHA256 ae89aef7a309d37de76e870fc56c0dd0f08e5849eb3388e3c05a1f8b134b2be3
+DIST cli_linux_10.2.zip 1813781 RMD160 56dd7e14ffd5fe52d193f1346bf41ce1e98b068c SHA1 8ca0dc4919de5890008ac358004e1638159910e9 SHA256 405b07a2579117aa9d2866d6b449b26f716b07a07a11eb80bda910f6ff649385
 DIST tw_cli-freebsd-x86-9.5.0.1.tgz 706413 RMD160 e3808b3245d35bdb68a00b813b17874b130c5592 SHA1 e964863b253b8bf8546fe01fe30b2f6c329fc3d2 SHA256 2f6c95d04aa583eb8d036c2ac5ca86521a04b0d979f91d01296cd2fd89c56087
 DIST tw_cli-freebsd-x86-9.5.1.1.tgz 758920 RMD160 cabec914580093eb7a37099a868683b6d462df55 SHA1 989fafa11e7d9634e7ab0ae8a3e3a5220bb793d8 SHA256 a2b99b460925df5ffa353569072e23422d92adc81ba84dcd016b8332fbdedf33
 DIST tw_cli-freebsd-x86-9.5.2.tgz 785950 RMD160 fa0c1d79beabc97903e96325fb96d1a7ee17e235 SHA1 8935fb456b0b0dc0aeb19cb0ba6f7ab7886a98f5 SHA256 a82c886066481b556d8ac415dce633352d28241a5ad84e03227225bb87234d9f
@@ -31,6 +33,7 @@ DIST tw_cli-linux-x86_64-9.5.1.1.tgz 949532 RMD160 c572f15b043fbb6215dc592df431a
 DIST tw_cli-linux-x86_64-9.5.2.tgz 979071 RMD160 d419b24a1c5951ba55fc4e4a26220bef845ffdd5 SHA1 ce10e28c95f17d5d14f10edb7b434f94a9a5384e SHA256 2e00233fd4e591220d4732dbc766ae9af5655ba8c000cb4f24504a593455b437
 DIST tw_cli-linux-x86_64-9.5.3.tgz 986751 RMD160 9549816e190c76bc25715283a629d6ba6971c3f3 SHA1 14a64755e799df17e262c38d514b3f758dd37e4c SHA256 3fd481b69b3a90abafe32966bf30040db89c70836d9d9536f21e0ab641f64ce6
 EBUILD tw_cli-10.1.ebuild 3142 RMD160 ace171d8bee93e1d246d3f3e13b4183e6b757623 SHA1 d8c1af49b287b8264f93304279c199d004020ad3 SHA256 8a3d8a49f98f365721535e35f042a73b4fd4fd8e93cc42220d9eef328adf5991
+EBUILD tw_cli-10.2.ebuild 3476 RMD160 2ac53252d423bb237232855117124f79644061e2 SHA1 237cc08e1e3bdffe1e5709ca65b67d0845e097ab SHA256 41fc741ec26f5bfc2443063f0af7e8c6b99f46c967f78b07f3cd3c9b50839f19
 EBUILD tw_cli-9.2.1.1.ebuild 2135 RMD160 fef9d4d3991af3b99d43fd2b953d57e8e41e4662 SHA1 be638f13a2ba1b7e7883e94c07f0e8be8e2c7ac5 SHA256 6a8c5b88822b9c16225b1c9ee6e43c4f7061d6f0fe76c9f03dba824428a5f247
 EBUILD tw_cli-9.3.0.2.ebuild 2014 RMD160 1a0dd9c328abad4105aa750a7c22c97a84b7ceba SHA1 50c0389962c24293b5f2ce5bda7fe8fc94db5427 SHA256 b3fa7718a3216a3e288cb4e22a90ff90ee5f30bcf0a8a4487c1d784c0c4f7568
 EBUILD tw_cli-9.3.0.3.ebuild 2023 RMD160 050f0c60aa297ac0e31b5b103a8d324626094cc9 SHA1 6d87de0d50ca83ec010612b3bfde58757146744f SHA256 06dd43a0106238de7b85488bc571d461dcd4e8744ed66c8b850282efb4435ddc
@@ -44,5 +47,5 @@ EBUILD tw_cli-9.5.0.ebuild 3172 RMD160 5419050109f2bd686b6c9933e038c8ee59745cbc
 EBUILD tw_cli-9.5.1.1.ebuild 3122 RMD160 80e15eb749ec7acc802216b93ac6b91677324578 SHA1 eaea48d32d23b9bf1c9e036b493d459a0692007d SHA256 3db1ac34e328b4940d14aee202fe7aa76dd42ea3a99f1719fc8e2ea30a114a43
 EBUILD tw_cli-9.5.2.ebuild 3257 RMD160 272aed11c5e6ef06db8a3c4ebff3919527484d06 SHA1 73d21e48194db6a0e9baa96cd3318e40f44ae20a SHA256 2c5ea907d4beba177219f982e8f29b31252fd72baa496fae8344db45b09fbaa2
 EBUILD tw_cli-9.5.3.ebuild 3259 RMD160 c4b01f29561f22698fccf2fcb5e6ddad3d0cfb9a SHA1 601c4407c8f8e33b5a110d2f1379b146eb331723 SHA256 bfe3b2696732b364a3c80620c205481c5ec42d6eb34f26d8788e8c7590ff8fd2
-MISC ChangeLog 6536 RMD160 58e37085b5c896e0401f9e68829b3805b8c4715e SHA1 d9df6ce0395f54cc5ff612dd82c7cd20a5a7c4e2 SHA256 46d79b4931a626d915cb1e0a86af5c5c0219dd4b6ea5ab74ba62fa43b07e97ed
+MISC ChangeLog 6811 RMD160 b737f2b3ac786bac5c7d2ee173b955c9da38705f SHA1 3a2f68ad65017d470e321e0e82128cbf7a7ecdf6 SHA256 178f79f1c263ee248e4123367b9d99a7d6b295fbb83f5c92ce3dbd1522b24809
 MISC metadata.xml 478 RMD160 f5d57054c2548e464973d613d9fba79023dfdcf9 SHA1 0fadc040d60cfd58f2f7310b2cc6e5059cdf0a9c SHA256 6f38854b183db189aac7952ea0f345e2898a4b6d8ff96a1a81c3c305c43c81da
diff --git a/sys-block/tw_cli/tw_cli-10.2.ebuild b/sys-block/tw_cli/tw_cli-10.2.ebuild
new file mode 100644
index 000000000000..da96ec2cbaf8
--- /dev/null
+++ b/sys-block/tw_cli/tw_cli-10.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/tw_cli-10.2.ebuild,v 1.1 2010/11/15 22:02:51 robbat2 Exp $
+
+EAPI="2"
+DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
+HOMEPAGE="http://www.3ware.com/kb/article.aspx?id=14847"
+LICENSE="3ware"
+SLOT="0"
+# binary packages
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+# stripping seems to break this sometimes
+RESTRICT="strip primaryuri"
+# binary packages
+DEPEND=""
+RDEPEND=""
+
+# Upstream has _FUN_ naming these
+# We are mostly prepared for the FreeBSD binaries at this point
+# They just aren't yet enabled here
+PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
+[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
+PN_ARCH="${ARCH/*-}"
+PN_ARCH="${PN_ARCH/amd64/x86_64}"
+
+# The naming of <=9.5.0 for freebsd was weird,
+# but 9.5.0.1 has it sanely.
+MY_P="cli_${PN_KERNEL}_${PV}"
+
+# Upstream actually only releases newer versions for new hardware
+# and doesn't release new major versions for old hardware
+# however their backwards compatibility is excellent.
+# I personally test tw_cli on 5 cards:
+# 9550SXU-4LP on amd64
+# 9650SE-{2LP,8LPML} on amd64.
+# 9690SA-{4I,8I} on amd64
+# - Robin H. Johnson <robbat2@gentoo.org> - 15 Nov 2010
+#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
+#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
+#HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
+HW_VARIANT="3ware%20SAS%209750-8i%20Gentoo"
+# package has different tarballs for x86 and amd64
+SRC_URI_BASE="http://www.lsi.com/DistributionSystem/AssetDocument"
+SRC_URI_SUFFIX="?prodName=${HW_VARIANT}"
+SRC_URI_A_linux="cli_linux_${PV}.zip"
+SRC_URI_A_fbsd="cli_freebsd_${PV}.zip"
+SRC_URI_linux="${SRC_URI_BASE}/${SRC_URI_A_linux}${SRC_URI_SUFFIX} -> ${SRC_URI_A_linux}"
+SRC_URI_fbsd="${SRC_URI_BASE}/${SRC_URI_A_fbsd}${SRC_URI_SUFFIX} -> ${SRC_URI_A_fbsd}"
+SRC_URI="kernel_linux?   ( ${SRC_URI_linux} )
+		 kernel_FreeBSD? ( ${SRC_URI_fbsd} )"
+		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
+SRC_URI_mine="${SRC_URI_BASE}/cli_${PN_KERNEL}_${PV}.zip"
+LICENSE_URL="http://www.lsi.com/lookup/License.aspx?url=${SRC_URI_mine}&prodName=${HW_VARIANT}&subType=Binary&locale="
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${MY_P}.zip
+}
+
+supportedcards() {
+	elog "This binary supports should support ALL cards, including, but not"
+	elog "limited to the following series:"
+	elog ""
+	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
+	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
+	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
+	elog "      9690SA, 9750"
+	elog ""
+	elog "Release notes for this version are available at:"
+	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
+}
+
+pkg_setup() {
+	supportedcards
+}
+
+pkg_nofetch() {
+	einfo "3ware would like you to agree to the license:"
+	einfo ""
+	einfo "\t${LICENSE_URL}"
+	einfo ""
+	einfo "And then use the following URL to download the"
+	einfo "correct tarballs manually into ${DISTDIR}"
+	einfo ""
+	einfo "Linux - ${SRC_URI_linux}"
+	einfo "FreeBSD - ${SRC_URI_fbsd}"
+	einfo ""
+	einfo "However, they have given permission to redistribute."
+	einfo "http://bugs.gentoo.org/show_bug.cgi?id=60690#c106"
+	einfo ""
+	supportedcards
+}
+
+src_install() {
+	into /
+	dosbin ${PN_ARCH}/tw_cli
+	into /usr
+	# 10.2 is missing this
+	if [[ -f tw_cli.8.nroff ]]; then
+		newman tw_cli.8.nroff tw_cli.8
+	else
+		ewarn "Upstream's 10.2 release is missing the tw_cli manpage."
+	fi
+	dohtml *.html
+}