Bug 288797: <sg3_utils-1.28 and >=sdparm-1.04 have a conflict on a script sas_disk_blink that moved to sdparm.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

9 files changed, 35 insertions, 15 deletions

diff --git a/sys-apps/sdparm/ChangeLog b/sys-apps/sdparm/ChangeLog
index 8058f1ace6c2..0a781b07387f 100644
--- a/sys-apps/sdparm/ChangeLog
+++ b/sys-apps/sdparm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sdparm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/ChangeLog,v 1.51 2009/10/12 21:52:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/ChangeLog,v 1.52 2009/10/13 20:07:18 robbat2 Exp $
+
+  13 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> sdparm-1.04.ebuild:
+  Bug 288797: <sg3_utils-1.28 and >=sdparm-1.04 have a conflict on a script
+  sas_disk_blink that moved to sdparm.
 
 *sdparm-1.04 (12 Oct 2009)
 
diff --git a/sys-apps/sdparm/sdparm-1.04.ebuild b/sys-apps/sdparm/sdparm-1.04.ebuild
index c8b92d23411b..b338e36a149c 100644
--- a/sys-apps/sdparm/sdparm-1.04.ebuild
+++ b/sys-apps/sdparm/sdparm-1.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-1.04.ebuild,v 1.2 2009/10/12 22:06:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-1.04.ebuild,v 1.3 2009/10/13 20:07:18 robbat2 Exp $
 
 DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
 HOMEPAGE="http://sg.danny.cz/sg/sdparm.html"
@@ -11,6 +11,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
+# Older releases contain a conflicting sas_disk_blink
+RDEPEND="!<sys-apps/sg3_utils-1.28"
+
 src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc NEWS AUTHORS ChangeLog CREDITS README notes.txt
diff --git a/sys-apps/sg3_utils/ChangeLog b/sys-apps/sg3_utils/ChangeLog
index 1fa6eb0121d8..55b850684ff8 100644
--- a/sys-apps/sg3_utils/ChangeLog
+++ b/sys-apps/sg3_utils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2009/10/12 22:10:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.57 2009/10/13 20:07:17 robbat2 Exp $
+
+  13 Oct 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.20080726.ebuild, sg3_utils-1.27.20080726-r1.ebuild,
+  sg3_utils-1.27.20090411.ebuild:
+  Bug 288797: <sg3_utils-1.28 and >=sdparm-1.04 have a conflict on a script
+  sas_disk_blink that moved to sdparm.
 
 *sg3_utils-1.28 (12 Oct 2009)
 
diff --git a/sys-apps/sg3_utils/sg3_utils-1.25.ebuild b/sys-apps/sg3_utils/sg3_utils-1.25.ebuild
index 3b20d16cbc4d..ce8eb9ba52b7 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.25.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.25.ebuild
@@ -1,6 +1,6 @@
 # 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.25.ebuild,v 1.10 2009/02/11 02:28:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.25.ebuild,v 1.11 2009/10/13 20:07:17 robbat2 Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="sys-devel/libtool"
-RDEPEND="sys-apps/sdparm"
+RDEPEND="sys-apps/sdparm
+		 !>=sys-apps/sdparm-1.04"
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
 src_install() {
diff --git a/sys-apps/sg3_utils/sg3_utils-1.26-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.26-r1.ebuild
index cd995d8dfdbd..447c83191284 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.26-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.26-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.26-r1.ebuild,v 1.2 2009/02/11 02:28:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.26-r1.ebuild,v 1.3 2009/10/13 20:07:17 robbat2 Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="sys-devel/libtool"
-RDEPEND="sys-apps/sdparm"
+RDEPEND="sys-apps/sdparm
+		 !>=sys-apps/sdparm-1.04"
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
 src_unpack() {
diff --git a/sys-apps/sg3_utils/sg3_utils-1.26.ebuild b/sys-apps/sg3_utils/sg3_utils-1.26.ebuild
index d060a8bad5db..1478ca13387f 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.26.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.26.ebuild
@@ -1,6 +1,6 @@
 # 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.26.ebuild,v 1.2 2009/02/11 02:28:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.26.ebuild,v 1.3 2009/10/13 20:07:17 robbat2 Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="sys-devel/libtool"
-RDEPEND="sys-apps/sdparm"
+RDEPEND="sys-apps/sdparm
+		 !>=sys-apps/sdparm-1.04"
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
 src_install() {
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
index ca4026b60a73..f2b537667419 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.27.20080726-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.27.20080726-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.27.20080726-r1.ebuild,v 1.2 2009/10/13 20:07:17 robbat2 Exp $
 
 inherit eutils
 
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/libtool"
-RDEPEND="sys-apps/sdparm"
+RDEPEND="sys-apps/sdparm
+		 !>=sys-apps/sdparm-1.04"
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
 S="${WORKDIR}/${P/.200*}"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.27.20080726.ebuild b/sys-apps/sg3_utils/sg3_utils-1.27.20080726.ebuild
index 676e3ffb640c..6c1248e112f1 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.27.20080726.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.27.20080726.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2009/07/26 00:39:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.27.20080726.ebuild,v 1.2 2009/10/13 20:07:17 robbat2 Exp $
 
 inherit eutils
 
@@ -15,7 +15,8 @@ KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/libtool"
-RDEPEND="sys-apps/sdparm"
+RDEPEND="sys-apps/sdparm
+		 !>=sys-apps/sdparm-1.04"
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
 S="${WORKDIR}/${P/.200*}"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.27.20090411.ebuild b/sys-apps/sg3_utils/sg3_utils-1.27.20090411.ebuild
index 5e4eee3200ed..bd3e430f4f2f 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.27.20090411.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.27.20090411.ebuild
@@ -1,6 +1,6 @@
 # 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.20090411.ebuild,v 1.1 2009/07/26 00:39:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.27.20090411.ebuild,v 1.2 2009/10/13 20:07:17 robbat2 Exp $
 
 inherit eutils
 
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/libtool"
-RDEPEND="sys-apps/sdparm"
+RDEPEND="sys-apps/sdparm
+		 !>=sys-apps/sdparm-1.04"
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
 S="${WORKDIR}/${P/.200*}"