Bug #278909: Upstream re-released v1.27, 9 months later, with a LOT of updates. Adding the date into the version number so that we can track which release was actually being used. Copies of each tarball uploaded the mirrors. Also use relative symlinks instead of absolute ones for the libsgutils2/libsgutils compat fix.

(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 68 insertions, 225 deletions

diff --git a/sys-apps/sg3_utils/ChangeLog b/sys-apps/sg3_utils/ChangeLog
index a40ad3a7d5a3..ff99da5b1c96 100644
--- a/sys-apps/sg3_utils/ChangeLog
+++ b/sys-apps/sg3_utils/ChangeLog
@@ -1,223 +1,17 @@
 # ChangeLog for sys-apps/sg3_utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.53 2009/07/20 16:57:58 nirbheek Exp $
-
-*sg3_utils-1.27-r1 (20 Jul 2009)
-
-  20 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
-  +sg3_utils-1.27-r1.ebuild:
-  Better fix for bug 231089; some packages look for sgutils2
-
-  15 Jul 2009; nixnut <nixnut@gentoo.org> sg3_utils-1.27.ebuild:
-  ppc stable #273076
-
-  22 Jun 2009; Raúl Porcel <armin76@gentoo.org> sg3_utils-1.27.ebuild:
-  ia64 stable wrt #273076
-
-  19 Jun 2009; Brent Baude <ranger@gentoo.org> sg3_utils-1.27.ebuild:
-  stable ppc64, bug 273076
-
-  11 Jun 2009; Tiago Cunha <tcunha@gentoo.org> sg3_utils-1.27.ebuild:
-  stable sparc, bug 273076
-
-  10 Jun 2009; Markus Meier <maekke@gentoo.org> sg3_utils-1.27.ebuild:
-  amd64/x86 stable, bug #273076
-
-  08 Jun 2009; Jeroen Roovers <jer@gentoo.org> sg3_utils-1.27.ebuild:
-  Stable for HPPA (bug #273076).
-
-  11 Feb 2009; Robin H. Johnson <robbat2@gentoo.org> sg3_utils-1.25.ebuild,
-  sg3_utils-1.26.ebuild, sg3_utils-1.26-r1.ebuild, sg3_utils-1.27.ebuild:
-  Bug 258388: new hosting location.
-
-*sg3_utils-1.27 (18 Aug 2008)
-
-  18 Aug 2008; Mike Frysinger <vapier@gentoo.org> +sg3_utils-1.27.ebuild:
-  Version bump and rename libsgutils2 back to libsgutils #231089.
-
-  27 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
-  -files/sg3_utils-llseek.patch, -sg3_utils-1.11.ebuild,
-  -sg3_utils-1.21.ebuild, -sg3_utils-1.22.ebuild, -sg3_utils-1.23.ebuild,
-  -sg3_utils-1.24.ebuild:
-  Cleanup old ebuilds.
-
-*sg3_utils-1.26-r1 (27 Jun 2008)
-
-  27 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
-  +files/sg3_utils-1.26-stdint.patch, +sg3_utils-1.26-r1.ebuild:
-  Bug #229653, fix need for stdint.h headers thanks to Ed Catmur
-  <ed@catmur.co.uk>.
-
-*sg3_utils-1.26 (25 Jun 2008)
-
-  25 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> +sg3_utils-1.26.ebuild:
-  Version bump.
-
-  22 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> sg3_utils-1.25.ebuild:
-  amd64 stable wrt bug #205925
-
-  31 Jan 2008; nixnut <nixnut@gentoo.org> sg3_utils-1.25.ebuild:
-  Stable on ppc wrt bug 205925
-
-  16 Jan 2008; Ferris McCormick <fmccor@gentoo.org> sg3_utils-1.25.ebuild:
-  Sparc stable, Bug #205925.
-
-  16 Jan 2008; Jeroen Roovers <jer@gentoo.org> sg3_utils-1.25.ebuild:
-  Stable for HPPA (bug #205925).
-
-  15 Jan 2008; Brent Baude <ranger@gentoo.org> sg3_utils-1.25.ebuild:
-  Marking sg3_utils-1.25 ppc64 for bug 205925
-
-  15 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
-  sg3_utils-1.25.ebuild:
-  stable x86, bug 205925
-
-  20 Nov 2007; Markus Rothe <corsair@gentoo.org> sg3_utils-1.25.ebuild:
-  Added ~ppc64; bug #199372
-
-  20 Nov 2007; Raúl Porcel <armin76@gentoo.org> sg3_utils-1.25.ebuild:
-  Add ~ia64 wrt #199372
-
-*sg3_utils-1.25 (21 Oct 2007)
-
-  21 Oct 2007; Robin H. Johnson <robbat2@gentoo.org> sg3_utils-1.24.ebuild,
-  +sg3_utils-1.25.ebuild:
-  Version bump. Upstream has converted to autotools building now.
-
-  24 Aug 2007; <metalgod@gentoo.org> sg3_utils-1.24.ebuild:
-  Stable on amd64. Bug #185631.
-
-  17 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  sg3_utils-1.24.ebuild:
-  ppc stable
-
-  30 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
-  sg3_utils-1.24.ebuild:
-  stable x86, bug 185631
-
-  02 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> sg3_utils-1.24.ebuild:
-  Stable on sparc
-
-*sg3_utils-1.24 (24 May 2007)
-
-  24 May 2007; Robin H. Johnson <robbat2@gentoo.org> +sg3_utils-1.24.ebuild:
-  Version bump. Break rescan-scsi-bus back out to a seperate package.
-
-  08 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> sg3_utils-1.23.ebuild:
-  Stable on sparc
-
-*sg3_utils-1.23 (02 Feb 2007)
-
-  02 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  +sg3_utils-1.23.ebuild:
-  Version bump
-
-  16 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> sg3_utils-1.22.ebuild:
-  Stable on sparc
-
-*sg3_utils-1.22 (24 Oct 2006)
-
-  24 Oct 2006; Mike Frysinger <vapier@gentoo.org> +sg3_utils-1.22.ebuild:
-  Version bump.
-
-  05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  -sg3_utils-1.08.ebuild, -sg3_utils-1.15.ebuild, -sg3_utils-1.18.ebuild,
-  -sg3_utils-1.19.ebuild, -sg3_utils-1.20.ebuild, -sg3_utils-1.20-r1.ebuild,
-  sg3_utils-1.21.ebuild:
-  1.21 sparc/hppa stable and cleanup
-
-*sg3_utils-1.21 (14 Sep 2006)
-
-  14 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  +sg3_utils-1.21.ebuild:
-  Revbump thanks to Douglas Gilbert
-
-  02 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  sg3_utils-1.20-r1.ebuild:
-  Stable on hppa
-
-  29 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  sg3_utils-1.20-r1.ebuild:
-  Keyworded ~hppa
-
-  28 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  sg3_utils-1.20-r1.ebuild:
-  Stable on sparc
-
-*sg3_utils-1.20-r1 (30 Apr 2006)
-
-  30 Apr 2006; Robin H. Johnson <robbat2@gentoo.org>
-  +sg3_utils-1.20-r1.ebuild:
-  Cleanup of Makefile mangling.
-
-*sg3_utils-1.20 (20 Apr 2006)
-
-  20 Apr 2006; Robin H. Johnson <robbat2@gentoo.org> +sg3_utils-1.20.ebuild:
-  Version bump.
-
-*sg3_utils-1.19 (20 Feb 2006)
-
-  20 Feb 2006; Robin H. Johnson <robbat2@gentoo.org> +sg3_utils-1.19.ebuild:
-  Version bump. Also install documentation and hxascdmp utility.
-
-  06 Jan 2006; Tom Martin <slarti@gentoo.org> sg3_utils-1.18.ebuild:
-  Fix typo in sed, resolves bug #118040.
-
-  29 Dec 2005; Tom Martin <slarti@gentoo.org> sg3_utils-1.18.ebuild:
-  Multilib fix.
-
-*sg3_utils-1.18 (05 Dec 2005)
-
-  05 Dec 2005; Robin H. Johnson <robbat2@gentoo.org> +sg3_utils-1.18.ebuild:
-  Version bump.
-
-  31 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> sg3_utils-1.11.ebuild:
-  Stable on sparc
-
-*sg3_utils-1.15 (06 Jun 2005)
-
-  06 Jun 2005; Mike Frysinger <vapier@gentoo.org> +sg3_utils-1.15.ebuild:
-  Version bump and clean up stupid RPATH.
-
-*sg3_utils-1.11 (28 Nov 2004)
-
-  28 Nov 2004; <plasmaroo@gentoo.org> -sg3_utils-1.10.ebuild,
-  +sg3_utils-1.11.ebuild:
-  Version bump, bug #72575.
-
-*sg3_utils-1.10 (07 Nov 2004)
-
-  07 Nov 2004; <plasmaroo@gentoo.org> -sg3_utils-1.06.ebuild,
-  sg3_utils-1.08.ebuild, +sg3_utils-1.10.ebuild:
-  Added "Contains rescan_scsi_bus." to ${DESCRIPTION} and added 1.10 - bugs
-  #70012, #70019. Marked 1.08 stable on x86.
-
-  31 Aug 2004; David Holm <dholm@gentoo.org> sg3_utils-1.08.ebuild:
-  Added to ~ppc.
-
-*sg3_utils-1.08 (14 Aug 2004)
-
-  14 Aug 2004; <plasmaroo@gentoo.org> -sg3_utils-1.07.ebuild,
-  +sg3_utils-1.08.ebuild:
-  1.07 is broken on 2.4 headers; 1.08 seems to rectify this issue.
-
-*sg3_utils-1.07 (13 Aug 2004)
-
-  13 Aug 2004; <plasmaroo@gentoo.org> +sg3_utils-1.07.ebuild:
-  Version bump, also added Kurt Garloff's rescan-scsi-bus.sh script by request.
-
-  09 Aug 2004; <plasmaroo@gentoo.org> sg3_utils-1.06.ebuild,
-  +files/sg3_utils-llseek.patch:
-  Added a patch to solve PIC issues; bug #59832.
-
-  09 Aug 2004; Travis Tilley <lv@gentoo.org> sg3_utils-1.06.ebuild:
-  Added ~amd64 keyword.
-
-  18 Jun 2004; Jason Wever <weeve@gentoo.org> sg3_utils-1.06.ebuild:
-  Added ~sparc keyword.
-
-*sg3_utils-1.06 (10 Feb 2004)
-
-  10 Feb 2004; <plasmaroo@gentoo.org> sg3_utils-1.06.ebuild:
-  Initial commit, closes bug #28981.
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.54 2009/07/26 00:39:57 robbat2 Exp $
+
+*sg3_utils-1.27.20090411 (26 Jul 2009)
+*sg3_utils-1.27.20080726-r1 (26 Jul 2009)
+*sg3_utils-1.27.20080726 (26 Jul 2009)
+
+  26 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> -sg3_utils-1.27.ebuild,
+  -sg3_utils-1.27-r1.ebuild, +sg3_utils-1.27.20080726.ebuild,
+  +sg3_utils-1.27.20080726-r1.ebuild, +sg3_utils-1.27.20090411.ebuild:
+  Bug #278909: Upstream re-released v1.27, 9 months later, with a LOT of
+  updates. Adding the date into the version number so that we can track
+  which release was actually being used. Copies of each tarball uploaded the
+  mirrors. Also use relative symlinks instead of absolute ones for the
+  libsgutils2/libsgutils compat fix.
 
diff --git a/sys-apps/sg3_utils/sg3_utils-1.27.20080726-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.27.20080726-r1.ebuild
new file mode 100644
index 000000000000..ca4026b60a73
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.27.20080726-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.27.20080726-r1.ebuild,v 1.1 2009/07/26 00:39:57 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="http://sg.danny.cz/sg/"
+#SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-devel/libtool"
+RDEPEND="sys-apps/sdparm"
+PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
+
+S="${WORKDIR}/${P/.200*}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+	dodoc ChangeLog AUTHORS COVERAGE CREDITS README*
+	dodoc doc/README.doc examples/*.txt
+	newdoc scripts/README README.scripts
+	dosbin scripts/{scsi,sas}* || die
+
+	# Better fix for bug 231089; some packages look for sgutils2
+	local path lib
+	path="/usr/$(get_libdir)"
+	for lib in "${D}"/usr/$(get_libdir)/libsgutils2.*; do
+		lib=${lib##*/}
+		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+	done
+}
diff --git a/sys-apps/sg3_utils/sg3_utils-1.27.ebuild b/sys-apps/sg3_utils/sg3_utils-1.27.20080726.ebuild
index 99844cf415cd..676e3ffb640c 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.27.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.27.20080726.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.27.ebuild,v 1.8 2009/07/15 18:45:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.27.20080726.ebuild,v 1.1 2009/07/26 00:39:57 robbat2 Exp $
 
 inherit eutils
 
 DESCRIPTION="Apps for querying the sg SCSI interface"
 HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+#SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,6 +18,8 @@ DEPEND="sys-devel/libtool"
 RDEPEND="sys-apps/sdparm"
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
+S="${WORKDIR}/${P/.200*}"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.27-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.27.20090411.ebuild
index 3c34f21e0fad..5e4eee3200ed 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.27-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.27.20090411.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.27-r1.ebuild,v 1.1 2009/07/20 16:57:58 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.27.20090411.ebuild,v 1.1 2009/07/26 00:39:57 robbat2 Exp $
 
 inherit eutils
 
 DESCRIPTION="Apps for querying the sg SCSI interface"
 HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+#SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,6 +18,8 @@ DEPEND="sys-devel/libtool"
 RDEPEND="sys-apps/sdparm"
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
+S="${WORKDIR}/${P/.200*}"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -35,6 +38,6 @@ src_install() {
 	path="/usr/$(get_libdir)"
 	for lib in "${D}"/usr/$(get_libdir)/libsgutils2.*; do
 		lib=${lib##*/}
-		dosym "${path}/${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
 	done
 }