public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sebastian Pipping (sping)" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/drqueue: drqueue-0.64.3-r1.ebuild ChangeLog drqueue-9999.ebuild
Date: Sat, 06 Feb 2010 02:54:15 +0000	[thread overview]
Message-ID: <E1NdaoJ-0006SV-Tq@stork.gentoo.org> (raw)

sping       10/02/06 02:54:15

  Modified:             drqueue-0.64.3-r1.ebuild ChangeLog
                        drqueue-9999.ebuild
  Log:
  media-gfx/drqueue: Remove drqman leftovers for USE=-X (bug #302939)
  (Portage version: 2.2_rc61/cvs/Linux i686)

Revision  Changes    Path
1.2                  media-gfx/drqueue/drqueue-0.64.3-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild?r1=1.1&r2=1.2

Index: drqueue-0.64.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-0.64.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drqueue-0.64.3-r1.ebuild	29 Jan 2010 15:47:55 -0000	1.1
+++ drqueue-0.64.3-r1.ebuild	6 Feb 2010 02:54:15 -0000	1.2
@@ -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 @@
 
 	# 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/ \



1.2                  media-gfx/drqueue/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/drqueue/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	29 Jan 2010 15:47:55 -0000	1.1
+++ ChangeLog	6 Feb 2010 02:54:15 -0000	1.2
@@ -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)



1.2                  media-gfx/drqueue/drqueue-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild?r1=1.1&r2=1.2

Index: drqueue-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drqueue-9999.ebuild	29 Jan 2010 15:47:55 -0000	1.1
+++ drqueue-9999.ebuild	6 Feb 2010 02:54:15 -0000	1.2
@@ -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 @@
 
 	# 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/ \






             reply	other threads:[~2010-02-06  2:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-06  2:54 Sebastian Pipping (sping) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-03-04 22:21 [gentoo-commits] gentoo-x86 commit in media-gfx/drqueue: drqueue-0.64.3-r1.ebuild ChangeLog drqueue-9999.ebuild Arfrever Frehtes Taifersar Arahesis (arfrever)
2011-03-28 19:29 Samuli Suominen (ssuominen)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1NdaoJ-0006SV-Tq@stork.gentoo.org \
    --to=sping@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox