Fix copyrights and add blocker against <x11-misc/qterm-0.4.0-r1, bug #176533

(Portage version: 2.1.3.19)

5 files changed, 23 insertions, 15 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index fc6c60d5cc46..dabe01329ccd 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/torque
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.56 2007/12/06 00:42:44 jsbronder Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.57 2008/01/02 16:07:25 jsbronder Exp $
+
+  02 Jan 2008; Justin Bronder <jsbronder@gentoo.org> torque-2.1.6.ebuild,
+  torque-2.2.1.ebuild, torque-2.2.1-r1.ebuild, torque-2.2.1-r2.ebuild:
+  Fix copyrights and add blocker against <x11-misc/qterm-0.4.0-r1, bug #176533
 
 *torque-2.2.1-r2 (06 Dec 2007)
 
diff --git a/sys-cluster/torque/torque-2.1.6.ebuild b/sys-cluster/torque/torque-2.1.6.ebuild
index 7e59677ddcf7..b8340add2e47 100644
--- a/sys-cluster/torque/torque-2.1.6.ebuild
+++ b/sys-cluster/torque/torque-2.1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.1.6.ebuild,v 1.10 2007/05/21 18:24:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.1.6.ebuild,v 1.11 2008/01/02 16:07:25 jsbronder Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -21,7 +21,8 @@ DEPEND_COMMON="virtual/libc
 	sys-libs/ncurses
 	sys-libs/readline
 	tk? ( dev-lang/tk )
-	!virtual/pbs"
+	!virtual/pbs
+	!<x11-misc/qterm-0.4.0-r1"
 
 DEPEND="${DEPEND_COMMON}
 	sys-apps/ed"
@@ -40,7 +41,7 @@ PBS_SERVER_HOME="${SPOOL_LOCATION}/PBS/"
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	epatch ${FILESDIR}/${PN}-setuid-safety.patch
+	epatch "${FILESDIR}"/${PN}-setuid-safety.patch
 }
 
 src_compile() {
diff --git a/sys-cluster/torque/torque-2.2.1-r1.ebuild b/sys-cluster/torque/torque-2.2.1-r1.ebuild
index f03619f6a13f..5b5d9a890078 100644
--- a/sys-cluster/torque/torque-2.2.1-r1.ebuild
+++ b/sys-cluster/torque/torque-2.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r1.ebuild,v 1.3 2007/12/04 21:38:12 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r1.ebuild,v 1.4 2008/01/02 16:07:25 jsbronder Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -22,7 +22,8 @@ DEPEND_COMMON="virtual/libc
 	tk? ( dev-lang/tk )
 	syslog? ( virtual/logger )
 	!virtual/pbs
-	!sys-cluster/openpbs-common"
+	!sys-cluster/openpbs-common
+	!<x11-misc/qterm-0.4.0-r1"
 
 DEPEND="${DEPEND_COMMON}
 	sys-apps/ed"
diff --git a/sys-cluster/torque/torque-2.2.1-r2.ebuild b/sys-cluster/torque/torque-2.2.1-r2.ebuild
index 1b19d97ec484..65cb1e12c8ef 100644
--- a/sys-cluster/torque/torque-2.2.1-r2.ebuild
+++ b/sys-cluster/torque/torque-2.2.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r2.ebuild,v 1.2 2007/12/06 00:42:44 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r2.ebuild,v 1.3 2008/01/02 16:07:25 jsbronder Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -22,7 +22,8 @@ DEPEND_COMMON="virtual/libc
 	tk? ( dev-lang/tk )
 	syslog? ( virtual/logger )
 	!virtual/pbs
-	!sys-cluster/openpbs-common"
+	!sys-cluster/openpbs-common
+	!<x11-misc/qterm-0.4.0-r1"
 
 DEPEND="${DEPEND_COMMON}
 	sys-apps/ed"
diff --git a/sys-cluster/torque/torque-2.2.1.ebuild b/sys-cluster/torque/torque-2.2.1.ebuild
index ed00bf9ded9d..c757e2ec1acf 100644
--- a/sys-cluster/torque/torque-2.2.1.ebuild
+++ b/sys-cluster/torque/torque-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1.ebuild,v 1.2 2007/11/25 00:28:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1.ebuild,v 1.3 2008/01/02 16:07:25 jsbronder Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -22,7 +22,8 @@ DEPEND_COMMON="virtual/libc
 	tk? ( dev-lang/tk )
 	syslog? ( virtual/logger )
 	!virtual/pbs
-	!sys-cluster/openpbs-common"
+	!sys-cluster/openpbs-common
+	!<x11-misc/qterm-0.4.0-r1"
 
 DEPEND="${DEPEND_COMMON}
 	sys-apps/ed"