summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2006-02-04 00:00:12 +0000
committerTim Yamin <plasmaroo@gentoo.org>2006-02-04 00:00:12 +0000
commit010b547e2eb69a2adbc0020496d6da73366a77c6 (patch)
tree1a4ba3aa1ed260a3e8606af5449b420824807e12 /sci-electronics
parentMark 0.7.6 stable on ia64 (diff)
downloadgentoo-2-010b547e2eb69a2adbc0020496d6da73366a77c6.tar.gz
gentoo-2-010b547e2eb69a2adbc0020496d6da73366a77c6.tar.bz2
gentoo-2-010b547e2eb69a2adbc0020496d6da73366a77c6.zip
Port over to modular X; remove stale patches in files/.
(Portage version: 2.1_pre4)
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/xcircuit/ChangeLog8
-rw-r--r--sci-electronics/xcircuit/files/digest-xcircuit-3.1.312
-rw-r--r--sci-electronics/xcircuit/files/digest-xcircuit-3.4.102
-rw-r--r--sci-electronics/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch10
-rw-r--r--sci-electronics/xcircuit/files/xcircuit-2.5.4-sigsegv.patch11
-rw-r--r--sci-electronics/xcircuit/xcircuit-3.1.31.ebuild12
-rw-r--r--sci-electronics/xcircuit/xcircuit-3.3.10.ebuild12
-rw-r--r--sci-electronics/xcircuit/xcircuit-3.4.10.ebuild12
8 files changed, 31 insertions, 38 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/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() {