media-gfx/drqueue: Remove drqman leftovers for USE=-X (bug #302939)

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

3 files changed, 29 insertions, 7 deletions

diff --git a/media-gfx/drqueue/ChangeLog b/media-gfx/drqueue/ChangeLog
index 132ce2b966f6..2fa2de124801 100644
--- a/media-gfx/drqueue/ChangeLog
+++ b/media-gfx/drqueue/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/drqueue
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/ChangeLog,v 1.1 2010/01/29 15:47:55 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/ChangeLog,v 1.2 2010/02/06 02:54:15 sping Exp $
+
+  06 Feb 2010; Sebastian Pipping <sping@gentoo.org>
+  drqueue-0.64.3-r1.ebuild, drqueue-9999.ebuild:
+  Remove drqman leftovers for USE=-X (bug #302939)
 
 *drqueue-9999 (29 Jan 2010)
 *drqueue-0.64.3-r1 (29 Jan 2010)
diff --git a/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild b/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild
index 94af71009119..d78d3bc420f1 100644
--- a/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild
+++ b/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild,v 1.1 2010/01/29 15:47:55 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild,v 1.2 2010/02/06 02:54:15 sping Exp $
 
 EAPI="2"
 
@@ -89,8 +89,17 @@ src_install() {
 
 	# fix bins and make links for /usr/bin
 	dodir /usr/bin
-	for cmd in blockhost cjob drqman jobfinfo \
-			jobinfo master requeue sendjob slave ; do
+	local commands=( blockhost cjob jobfinfo \
+			jobinfo master requeue sendjob slave )
+	if use X ; then
+		commands=( ${commands[@]} drqman )
+	else
+		# Remove drqman leftovers
+		for i in etc/drqman.rc etc/drqman.conf bin/drqman ; do
+			rm -v "${D}"/var/lib/drqueue/$i || die "rm failed"
+		done
+	fi
+	for cmd in ${commands[@]} ; do
 		dosed 's|SHLIB=\$DRQUEUE_ROOT/bin/shlib|SHLIB=/var/lib/drqueue/bin/shlib|' \
 				/var/lib/drqueue/bin/${cmd} || die "dosed failed"
 		dosym /var/lib/drqueue/bin/${cmd} /usr/bin/ \
diff --git a/media-gfx/drqueue/drqueue-9999.ebuild b/media-gfx/drqueue/drqueue-9999.ebuild
index 69832cf5ca35..f96f7473cab2 100644
--- a/media-gfx/drqueue/drqueue-9999.ebuild
+++ b/media-gfx/drqueue/drqueue-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild,v 1.1 2010/01/29 15:47:55 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild,v 1.2 2010/02/06 02:54:15 sping Exp $
 
 EAPI="2"
 
@@ -84,8 +84,17 @@ src_install() {
 
 	# fix bins and make links for /usr/bin
 	dodir /usr/bin
-	for cmd in blockhost cjob drqman jobfinfo \
-			jobinfo master requeue sendjob slave ; do
+	local commands=( blockhost cjob jobfinfo \
+			jobinfo master requeue sendjob slave )
+	if use X ; then
+		commands=( ${commands[@]} drqman )
+	else
+		# Remove drqman leftovers
+		for i in etc/drqman.rc etc/drqman.conf bin/drqman ; do
+			rm -v "${D}"/var/lib/drqueue/$i || die "rm failed"
+		done
+	fi
+	for cmd in ${commands[@]} ; do
 		dosed 's|SHLIB=\$DRQUEUE_ROOT/bin/shlib|SHLIB=/var/lib/drqueue/bin/shlib|' \
 				/var/lib/drqueue/bin/${cmd} || die "dosed failed"
 		dosym /var/lib/drqueue/bin/${cmd} /usr/bin/ \