Port over to modular X; remove stale patches in files/.

Package-Manager: portage-2.1_pre4

9 files changed, 54 insertions, 47 deletions

diff --git a/sci-electronics/xcircuit/ChangeLog b/sci-electronics/xcircuit/ChangeLog
index 07ab2813775c..efd8b3ecfb24 100644
--- a/sci-electronics/xcircuit/ChangeLog
+++ b/sci-electronics/xcircuit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/xcircuit
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.6 2005/12/22 23:02:19 plasmaroo Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.7 2006/02/04 00:00:12 plasmaroo Exp $
+
+  03 Feb 2006; <plasmaroo@gentoo.org> xcircuit-3.1.31.ebuild,
+  xcircuit-3.3.10.ebuild, xcircuit-3.4.10.ebuild:
+  Port over to modular X.
 
 *xcircuit-3.4.10 (22 Dec 2005)
 
diff --git a/sci-electronics/xcircuit/Manifest b/sci-electronics/xcircuit/Manifest
index e9fd93ba6c46..3704addcbd98 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,10 +1,24 @@
-MD5 7fc3774a739fa6188a9f5b65ea37b401 ChangeLog 3710
-MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
-MD5 c2684ade783a66cb46cf71e70a766aa0 xcircuit-3.1.31.ebuild 1203
-MD5 cec9ebc1cf60c51f5217db48c29e1a36 xcircuit-3.3.10.ebuild 1212
-MD5 a7eac15c0f9797babde27fea5bfe98a7 xcircuit-3.4.10.ebuild 1235
-MD5 f31e766c87ea445fe61d969cdf427d4b files/xcircuit-2.5.4-sigsegv.patch 306
+MD5 91b7dc45414b7ade8aca3f3618c690d9 ChangeLog 3849
+RMD160 7ff4c98682dde1a8011e7a4e103e091811aebba3 ChangeLog 3849
+SHA256 e9575897567ca713067a9ba01cb3fdae0c0992f70a4046836b2b1a416f6f2128 ChangeLog 3849
+MD5 146d2d92da2234bcc466b2bb15645012 files/digest-xcircuit-3.1.31 238
+RMD160 07115852ef7c934ed925298b891b05e3fde5f412 files/digest-xcircuit-3.1.31 238
+SHA256 49621bb60ad01f9448206e20204b2f0148a2318131cac468163ab67d11339dd8 files/digest-xcircuit-3.1.31 238
 MD5 77a4be8f41df15ace27164b9712c52e3 files/digest-xcircuit-3.3.10 65
-MD5 1567c7944bafab672ed3a8674c8b53b4 files/digest-xcircuit-3.4.10 64
-MD5 89d6bd7483424eb145efd4d3c58f6abb files/digest-xcircuit-3.1.31 64
-MD5 e89ab3e2fabd20a609586953924cb1d0 files/xcircuit-2.5.4-XQueryColor.patch 342
+RMD160 d32b6e17d8c801c0b4201965396093217a404b40 files/digest-xcircuit-3.3.10 65
+SHA256 a4a725c23509042e5e6fda4edc3be226c8a9d4c0e4bc003b654ffbe73a5c0eb0 files/digest-xcircuit-3.3.10 65
+MD5 c72462237357f0bf786da9cb69532827 files/digest-xcircuit-3.4.10 238
+RMD160 bcb5435297da255d568a7cd267f5a784e6ff13b3 files/digest-xcircuit-3.4.10 238
+SHA256 91e6350f77020f61e9c6742f7ee1968e477186bcb4d4d29554126b6cf1d32561 files/digest-xcircuit-3.4.10 238
+MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
+RMD160 97dc1fa1de002625a0e04371d72e5d457e63045e metadata.xml 220
+SHA256 2f6b6030e20679df7ccb7dab65f5ca6890144aa443f815d11e494a035ffef399 metadata.xml 220
+MD5 1f00675a2ac1187d9ae044e56efae4b5 xcircuit-3.1.31.ebuild 1235
+RMD160 b76f830873074fd812fb8d66b21c70f6f52b4114 xcircuit-3.1.31.ebuild 1235
+SHA256 7c8ea8886ef7a4cfe91a1377f69b17f27a15929c0161639bc7110f9d29cd87ca xcircuit-3.1.31.ebuild 1235
+MD5 7d738e368f10b1bed12e1c63b686fc76 xcircuit-3.3.10.ebuild 1244
+RMD160 8c78df221db3f175d0362b3616bc6926aa3127cd xcircuit-3.3.10.ebuild 1244
+SHA256 a22a74956ff8ca7ca04b0cc3567a2ecaa8da3b1919d76617fd7111bc67ff072c xcircuit-3.3.10.ebuild 1244
+MD5 7b0d5b6bdf6a2c68d7d8bf244f1eaf21 xcircuit-3.4.10.ebuild 1264
+RMD160 dc867426be6a2ba658db36a22068b2f09c444c41 xcircuit-3.4.10.ebuild 1264
+SHA256 8048cdca7473d32db907b6d26c2b5a43ded584515ae01ef1b473255bffc71873 xcircuit-3.4.10.ebuild 1264
diff --git a/sci-electronics/xcircuit/files/digest-xcircuit-3.1.31 b/sci-electronics/xcircuit/files/digest-xcircuit-3.1.31
index b1104b7e0024..95d236c98757 100644
--- a/sci-electronics/xcircuit/files/digest-xcircuit-3.1.31
+++ b/sci-electronics/xcircuit/files/digest-xcircuit-3.1.31
@@ -1 +1,3 @@
 MD5 e5187648ff88192790736a77370e6e39 xcircuit-3.1.31.tgz 819653
+RMD160 58b95e57a8f75a5230c9eb7919b23e671396c062 xcircuit-3.1.31.tgz 819653
+SHA256 89abd445fbbdb4cea9469b84d7b0f73597fef7e0448f3801b91f51fba00075b4 xcircuit-3.1.31.tgz 819653
diff --git a/sci-electronics/xcircuit/files/digest-xcircuit-3.4.10 b/sci-electronics/xcircuit/files/digest-xcircuit-3.4.10
index 5e30708d2714..59824a2d5760 100644
--- a/sci-electronics/xcircuit/files/digest-xcircuit-3.4.10
+++ b/sci-electronics/xcircuit/files/digest-xcircuit-3.4.10
@@ -1 +1,3 @@
 MD5 ec2d2d771b5ffaf996ae00b8da1e62b4 xcircuit-3.4.10.tgz 983183
+RMD160 34fb51e30a65fab8a97bce7ad2dea55599a890f1 xcircuit-3.4.10.tgz 983183
+SHA256 f354c0dbd64ea86837ca64cba127b94d228b80cc02c0f9989e022f7dc4a02e34 xcircuit-3.4.10.tgz 983183
diff --git a/sci-electronics/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch b/sci-electronics/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch
deleted file mode 100644
index 098d302dc93f..000000000000
--- a/sci-electronics/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xcircuit.c	2002-03-20 14:00:50.000000000 -0800
-+++ xcircuit.c	2002-10-11 12:24:24.000000000 -0700
-@@ -1845,6 +1845,7 @@
-    XQueryColor(dpy, cmap, &loccolor);
- 
-    locidx = rgb_alloccolor(loccolor.red, loccolor.green, loccolor.blue);
-+   return locidx;
- }
- 
- /*-------------------------------------------------------------------------*/
diff --git a/sci-electronics/xcircuit/files/xcircuit-2.5.4-sigsegv.patch b/sci-electronics/xcircuit/files/xcircuit-2.5.4-sigsegv.patch
deleted file mode 100644
index cce4b5ae7816..000000000000
--- a/sci-electronics/xcircuit/files/xcircuit-2.5.4-sigsegv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- files.c	2002-03-26 13:12:18.000000000 -0800
-+++ files.c	2002-10-11 12:23:38.000000000 -0700
-@@ -1970,6 +1970,8 @@
-    int curcolor = ccolor;
-    int i, j, k;
-    objinstptr *newinst;
-+   objinstptr  tmpobjinstptr;
-+   newinst = &tmpobjinstptr;
- 
-    /* path-handling variables */
-    pathptr *newpath;
diff --git a/sci-electronics/xcircuit/xcircuit-3.1.31.ebuild b/sci-electronics/xcircuit/xcircuit-3.1.31.ebuild
index fd74bb495f5a..b4c1880b5169 100644
--- a/sci-electronics/xcircuit/xcircuit-3.1.31.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.1.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.1.31.ebuild,v 1.2 2005/02/05 11:15:08 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.1.31.ebuild,v 1.3 2006/02/04 00:00:12 plasmaroo Exp $
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://xcircuit.ece.jhu.edu/archive/${P}.tgz"
@@ -11,9 +11,11 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="tcltk"
 
-DEPEND="virtual/x11
-	virtual/ghostscript
-	tcltk? ( dev-lang/tk )"
+DEPEND="virtual/ghostscript
+	tcltk? ( dev-lang/tk )
+	|| ( x11-libs/libXt
+	     virtual/x11
+	)"
 
 src_compile() {
 
diff --git a/sci-electronics/xcircuit/xcircuit-3.3.10.ebuild b/sci-electronics/xcircuit/xcircuit-3.3.10.ebuild
index 07d62a503d58..6c290c950800 100644
--- a/sci-electronics/xcircuit/xcircuit-3.3.10.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.3.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.3.10.ebuild,v 1.2 2005/04/14 15:22:17 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.3.10.ebuild,v 1.3 2006/02/04 00:00:12 plasmaroo Exp $
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://xcircuit.ece.jhu.edu/archive/${P}.tgz"
@@ -11,9 +11,11 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="tcltk"
 
-DEPEND="virtual/x11
-	virtual/ghostscript
-	tcltk? ( dev-lang/tk )"
+DEPEND="virtual/ghostscript
+	tcltk? ( dev-lang/tk )
+	|| ( x11-libs/libXt
+	     virtual/x11
+	)"
 
 src_compile() {
 
diff --git a/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild b/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild
index 6891bce8663e..532dc4e064fc 100644
--- a/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild,v 1.1 2005/12/22 23:02:19 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild,v 1.2 2006/02/04 00:00:12 plasmaroo Exp $
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
@@ -11,9 +11,11 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="tcltk"
 
-DEPEND="virtual/x11
-	virtual/ghostscript
-	tcltk? ( dev-lang/tk )"
+DEPEND="virtual/ghostscript
+	tcltk? ( dev-lang/tk )
+	|| ( x11-libs/libXt
+	     virtual/x11
+	)"
 
 src_compile() {