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

Package-Manager: portage-2.1.3.19

6 files changed, 43 insertions, 35 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/Manifest b/sys-cluster/torque/Manifest
index e92a48da1205..a2c33d72671f 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -48,26 +48,26 @@ RMD160 199a8d543c6f0de0934211ca248b637f61f1a0d0 files/torque-setuid-safety.patch
 SHA256 0770e6d88889224db2718c93846a55e1d17b6a457cbb2e80cd9d9e22a8d85e33 files/torque-setuid-safety.patch 1020
 DIST torque-2.1.6.tar.gz 2708793 RMD160 6802c2d49a36624d34fce7b96b29551da3ff1106 SHA1 f0437e3f429c5cecb44a7f991f2b7bd58baa7a0a SHA256 e5ac494859df9951ca34149ae56b93fbfc83d7d4ba015bc8b67514b190e51c36
 DIST torque-2.2.1.tar.gz 5370260 RMD160 219e5a4234a1bbf0241c15f568a720752e48587c SHA1 fafa9d66aa8bf8daa9e8f660903aa1105ff14bda SHA256 6d2674d471e300df6ebda56ef80c2a7be0de33fc619f98ee78eee69af1d179b8
-EBUILD torque-2.1.6.ebuild 4011 RMD160 6c7adb692028e9e75f2980974f5a9f9e35930d95 SHA1 68b223668d45c178b934c749a26d274f216c2bd7 SHA256 e8d1c44427d396b35805240a6707013bed3010155189f6b8d6ce1eb914f573b2
-MD5 64ebd8ba4e9016d73054a98a2f258942 torque-2.1.6.ebuild 4011
-RMD160 6c7adb692028e9e75f2980974f5a9f9e35930d95 torque-2.1.6.ebuild 4011
-SHA256 e8d1c44427d396b35805240a6707013bed3010155189f6b8d6ce1eb914f573b2 torque-2.1.6.ebuild 4011
-EBUILD torque-2.2.1-r1.ebuild 7190 RMD160 ef54652f2f777bd87ca97f5379f2222b8678deda SHA1 ac6e92d509b96dc6158bb36b0548c51d52c1cd27 SHA256 af1c99c4ddbfa9e19f167775e770d04ae9945201dce202a616f94b45b180a804
-MD5 6de3b279957cf4345ddc71d67576ed4c torque-2.2.1-r1.ebuild 7190
-RMD160 ef54652f2f777bd87ca97f5379f2222b8678deda torque-2.2.1-r1.ebuild 7190
-SHA256 af1c99c4ddbfa9e19f167775e770d04ae9945201dce202a616f94b45b180a804 torque-2.2.1-r1.ebuild 7190
-EBUILD torque-2.2.1-r2.ebuild 7190 RMD160 2d353ad8051dd3e9b05fe2f68353fef3deec996e SHA1 5d533d9f7223a2668a918423241a67c94f6fb4e9 SHA256 a2de7421e84aa7e283b4976f9f143315e3a32e47f4902349ec4e9c08b0911001
-MD5 beb6ac49df21aa6a3c0b3664875d4228 torque-2.2.1-r2.ebuild 7190
-RMD160 2d353ad8051dd3e9b05fe2f68353fef3deec996e torque-2.2.1-r2.ebuild 7190
-SHA256 a2de7421e84aa7e283b4976f9f143315e3a32e47f4902349ec4e9c08b0911001 torque-2.2.1-r2.ebuild 7190
-EBUILD torque-2.2.1.ebuild 4810 RMD160 f5d6b7dc83342b9f4ad29bff92dcea5600b93faf SHA1 154bf1d910c71fedc07c8842b7c67b882d87c6c9 SHA256 a8c2d003798ed5670475336dbfc3602f63aaee731eb0814a1ac9f0a793fc4eb8
-MD5 678639185655d58f46763c6372da93dc torque-2.2.1.ebuild 4810
-RMD160 f5d6b7dc83342b9f4ad29bff92dcea5600b93faf torque-2.2.1.ebuild 4810
-SHA256 a8c2d003798ed5670475336dbfc3602f63aaee731eb0814a1ac9f0a793fc4eb8 torque-2.2.1.ebuild 4810
-MISC ChangeLog 10244 RMD160 87c0727f1931392ff4be379b47e09abfb2f4f407 SHA1 c9a6ab089a40ba6d8eb171938e6194181feace73 SHA256 466d87a0dbafb02dacefeef6d74f00560a68b9fd9d1b873c37467cf2e459a2f1
-MD5 17fba1cea3e089a861d1172c35c81979 ChangeLog 10244
-RMD160 87c0727f1931392ff4be379b47e09abfb2f4f407 ChangeLog 10244
-SHA256 466d87a0dbafb02dacefeef6d74f00560a68b9fd9d1b873c37467cf2e459a2f1 ChangeLog 10244
+EBUILD torque-2.1.6.ebuild 4046 RMD160 8f86e25570708f5b654ddbaf457e63e3b6216d2a SHA1 da6d4c28dc8e4bd3602c774077e8105ad53dc138 SHA256 e50485f520e7f986daee2bee32a9c1a8bb5d5ad39a98c0a339b3935c0584d4af
+MD5 3ba3da13fe8c18db13311c9984d205b2 torque-2.1.6.ebuild 4046
+RMD160 8f86e25570708f5b654ddbaf457e63e3b6216d2a torque-2.1.6.ebuild 4046
+SHA256 e50485f520e7f986daee2bee32a9c1a8bb5d5ad39a98c0a339b3935c0584d4af torque-2.1.6.ebuild 4046
+EBUILD torque-2.2.1-r1.ebuild 7217 RMD160 7b2ec4e6ab84dae25fadfe1e11a1b34fb22d0931 SHA1 56279b217e79d26388f099624d8650a2589fb469 SHA256 f2975c0096d67e1c43219e6d9d8bc89dbca5c7cd19433cde6b29323203010078
+MD5 b7daeb92fe117857664fbc90a7ccfabb torque-2.2.1-r1.ebuild 7217
+RMD160 7b2ec4e6ab84dae25fadfe1e11a1b34fb22d0931 torque-2.2.1-r1.ebuild 7217
+SHA256 f2975c0096d67e1c43219e6d9d8bc89dbca5c7cd19433cde6b29323203010078 torque-2.2.1-r1.ebuild 7217
+EBUILD torque-2.2.1-r2.ebuild 7217 RMD160 3c92a5d006c29eecc8581d8e8af781e41bbe7321 SHA1 687138f0dcec4ec79c7746f487ba3d2927c4b38c SHA256 8e5171c8dc04d36ca8812f337d7e2f1f1e3a8884858e4bf1d4883b209cb15548
+MD5 20d71b629350d3e7dbb6256b6c5ff94c torque-2.2.1-r2.ebuild 7217
+RMD160 3c92a5d006c29eecc8581d8e8af781e41bbe7321 torque-2.2.1-r2.ebuild 7217
+SHA256 8e5171c8dc04d36ca8812f337d7e2f1f1e3a8884858e4bf1d4883b209cb15548 torque-2.2.1-r2.ebuild 7217
+EBUILD torque-2.2.1.ebuild 4837 RMD160 5ad5a8ef8e8ffd43dc8961e01d8fc60b8e62b342 SHA1 56973eedb9084bd94e81712f43fab1d4897cc9e1 SHA256 4a27057dff2d7296c00f8cc7d9cc83623b6821302e6e342264f65bd3b8fffe0a
+MD5 cd3580f1955bdbd75e904abe01bb4908 torque-2.2.1.ebuild 4837
+RMD160 5ad5a8ef8e8ffd43dc8961e01d8fc60b8e62b342 torque-2.2.1.ebuild 4837
+SHA256 4a27057dff2d7296c00f8cc7d9cc83623b6821302e6e342264f65bd3b8fffe0a torque-2.2.1.ebuild 4837
+MISC ChangeLog 10469 RMD160 caf297aa2bc700f806b00ca21cc8d78b91cd7aa0 SHA1 4900ad7b96cc87387c99703a4ef79ddd62f6347e SHA256 1069de3675238bad7f7be1c98c9225da2087a24e0a93699cedd66810ff6b9ed0
+MD5 105b3d597d7aaee0ccc4eeff90db77f9 ChangeLog 10469
+RMD160 caf297aa2bc700f806b00ca21cc8d78b91cd7aa0 ChangeLog 10469
+SHA256 1069de3675238bad7f7be1c98c9225da2087a24e0a93699cedd66810ff6b9ed0 ChangeLog 10469
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 MD5 6be723a646638c71a36096e65e6ef8f0 metadata.xml 163
 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 metadata.xml 163
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"