Bug #296216 - Move blockers to RDEPEND so they work for binary and installed packages.

(Portage version: 2.2_rc58/cvs/Linux i686)

4 files changed, 27 insertions, 16 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index bff97cacb258..84c4669e75a2 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.45 2009/11/13 19:19:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.46 2009/12/10 08:05:10 zmedico Exp $
+
+  10 Dec 2009; Zac Medico <zmedico@gentoo.org> linuxwacom-0.8.2.ebuild,
+  linuxwacom-0.8.3_p6.ebuild, linuxwacom-0.8.4_p1.ebuild:
+  Bug #296216 - Move blockers to RDEPEND so they work for binary and
+  installed packages.
 
   13 Nov 2009; Rémi Cardona <remi@gentoo.org> linuxwacom-0.8.2.ebuild,
   linuxwacom-0.8.3_p6.ebuild, linuxwacom-0.8.4_p1.ebuild:
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild
index 1783a3198c0f..2e1fe776903d 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.2.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/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild,v 1.10 2009/11/13 19:19:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild,v 1.11 2009/12/10 08:05:10 zmedico Exp $
 
 inherit eutils autotools toolchain-funcs linux-mod
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-RDEPEND="x11-proto/inputproto
+COMMON_DEPEND="x11-proto/inputproto
 	<x11-base/xorg-server-1.7
 	gtk? ( >=x11-libs/gtk+-2 )
 	tcl? ( dev-lang/tcl )
@@ -22,10 +22,12 @@ RDEPEND="x11-proto/inputproto
 	sys-fs/udev
 	sys-libs/ncurses"
 
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )
+RDEPEND="${COMMON_DEPEND}
 	!x11-drivers/xf86-input-wacom"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	usb? ( >=sys-kernel/linux-headers-2.6 )"
 S=${WORKDIR}/${P/_p/-}
 
 MODULE_NAMES="wacom(input:${S}/src:${S}/src)"
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
index 2f44fab9ec0a..46b4d9ef405b 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.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/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild,v 1.4 2009/11/13 19:19:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild,v 1.5 2009/12/10 08:05:10 zmedico Exp $
 
 inherit eutils autotools toolchain-funcs linux-mod
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
-RDEPEND="x11-proto/inputproto
+COMMON_DEPEND="x11-proto/inputproto
 	<x11-base/xorg-server-1.7
 	gtk? ( >=x11-libs/gtk+-2 )
 	tcl? ( dev-lang/tcl )
@@ -22,10 +22,12 @@ RDEPEND="x11-proto/inputproto
 	sys-fs/udev
 	sys-libs/ncurses"
 
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )
+RDEPEND="${COMMON_DEPEND}
 	!x11-drivers/xf86-input-wacom"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	usb? ( >=sys-kernel/linux-headers-2.6 )"
 S=${WORKDIR}/${P/_p/-}
 
 MODULE_NAMES="wacom(input:${S}/src:${S}/src)"
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild
index 8dff8c285fb4..71dd0efde8fc 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.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/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild,v 1.7 2009/11/13 19:19:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild,v 1.8 2009/12/10 08:05:10 zmedico Exp $
 
 inherit eutils autotools toolchain-funcs linux-mod
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
 
-RDEPEND="x11-proto/inputproto
+COMMON_DEPEND="x11-proto/inputproto
 	<x11-base/xorg-server-1.7
 	gtk? ( >=x11-libs/gtk+-2 )
 	tcl? ( dev-lang/tcl )
@@ -22,10 +22,12 @@ RDEPEND="x11-proto/inputproto
 	sys-fs/udev
 	sys-libs/ncurses"
 
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )
+RDEPEND="${COMMON_DEPEND}
 	!x11-drivers/xf86-input-wacom"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	usb? ( >=sys-kernel/linux-headers-2.6 )"
 S=${WORKDIR}/${P/_p/-}
 
 MODULE_NAMES="wacom(input:${S}/src:${S}/src)"