Version bump, and added Tcl/Tk support.

8 files changed, 78 insertions, 61 deletions

diff --git a/app-sci/xcircuit/ChangeLog b/app-sci/xcircuit/ChangeLog
index 63a29a6d8883..a847e86a589a 100644
--- a/app-sci/xcircuit/ChangeLog
+++ b/app-sci/xcircuit/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for app-sci/xcircuit
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/ChangeLog,v 1.11 2003/12/09 18:11:38 lanius Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/ChangeLog,v 1.12 2004/01/05 13:12:30 plasmaroo Exp $
+
+*xcircuit-3.1.31 (05 Jan 2004)
+
+  05 Jan 2004; <plasmaroo@gentoo.org> xcircuit-2.5.4.ebuild,
+  xcircuit-2.5.5.ebuild, xcircuit-3.1.29.ebuild, xcircuit-3.1.31.ebuild:
+  Bumped version, and added Tcl/Tk support.
 
   09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> xcircuit-2.5.4.ebuild,
   xcircuit-2.5.5.ebuild, xcircuit-3.1.29.ebuild:
-  changed app-text/ghostscript to virtual/ghostscript
+  Changed app-text/ghostscript to virtual/ghostscript.
 
 *xcircuit-3.1.29 (27 Nov 2003)
 
@@ -14,38 +20,32 @@
 *xcircuit-2.5.5 (5 Jan 2003)
 
   5 Jan 2003; George Shapovalov <george@gentoo.org> xcircuit-2.5.5.ebuild :
-
-  version update.
+  Version update.
 
 *xcircuit-2.5.4 (5 Apr 2002)
 
   15 Oct 2002; George Shapovalov <george@gentoo.org> xcircuit-2.5.4.ebuild
+  Changed '~x86' to 'x86' and added '~ppc' upon some test reports.
+  Updated HOMEPAGE and SRC_URI to point to the present location (package 
+  hosting seem to have moved a lot over last few month)
   
-  changed ~x86 to x86 and added ~ppc upon some test reports
-  updated HOMEPAGE and SRC_URI to point to the present location (package hosting 
-  seem to have moved a lot over last few month)
-  
-  14 Oct 2002; George Shapovalov <george@gentoo.org> xcircuit-2.5.4.ebuild, files/xcircuit-2.5.4-*.patch :
-
-  Thanks to Jonathan Nall <nall@themountaingoats.net> for tracing few gcc related problems. 
-  One patch is conditional on gcc-3.2 presence. See #8957 and #8960 for details.
+  14 Oct 2002; George Shapovalov <george@gentoo.org> xcircuit-2.5.4.ebuild, 
+  files/xcircuit-2.5.4-*.patch : Thanks to Jonathan Nall 
+  <nall@themountaingoats.net> for tracing few gcc related problems. One patch
+  is conditional on gcc-3.2 presence. See #8957 and #8960 for details.
 
   16 Aug 2002; George Shapovalov <george@gentoo.org> xcircuit-2.5.4.ebuild :
-
-  due to report by Marius Bernklev <mariube@sex.ifi.uio.no> added code 
-  to replace -O3 -> -O2 in C[XX]FLAGS
+  Due to report by Marius Bernklev <mariube@sex.ifi.uio.no> added code 
+  to replace -O3 -> -O2 in C[XX]FLAGS.
 
   25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> xcircuit-2.5.4.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   06 May 2002; George Shapovalov <george@gentoo.org> all :
-
-  moved from app-misc to app-sci
+  Moved from app-misc to app-sci.
 
   5 Apr 2002; Tod Neidt <tod@gentoo.org> xcircuit-2.5.4.ebuild, Changelog :
-
   Fixed typo on ghoscript dependency.
   
   5 Apr 2002; Tod Neidt <tod@gentoo.org> xcircuit-2.5.4.ebuild, Changelog :
- 
   Initial commit. User request. 
diff --git a/app-sci/xcircuit/Manifest b/app-sci/xcircuit/Manifest
index 883ef95fe6ee..e5a5125efe6b 100644
--- a/app-sci/xcircuit/Manifest
+++ b/app-sci/xcircuit/Manifest
@@ -1,8 +1,8 @@
-MD5 c7f1b9e61f671fa927dfac521ee7c52d ChangeLog 1835
-MD5 51ca6380de52e589cb87fd931d6aa28d xcircuit-2.5.4.ebuild 1217
+MD5 87ea7481619057cd7d1339c2d9a1f211 ChangeLog 2051
+MD5 4fb12f796471972685fcdef786537fb8 xcircuit-2.5.4.ebuild 1220
 MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
-MD5 a6b5c2385762f1d702770f4f1237adc8 xcircuit-3.1.31.ebuild 1193
-MD5 46e0cd2d43e028d390aff08e88c58aac xcircuit-2.5.5.ebuild 839
+MD5 f55dea430e27c41e9bc3f2d15bee691b xcircuit-3.1.31.ebuild 1196
+MD5 fd92c18790c5a317b75470f0fc473ae3 xcircuit-2.5.5.ebuild 842
 MD5 0e02e248fa08f87a01fe3f9ceb73031e files/xcircuit-2.5.4-sigsegv.patch 311
 MD5 89d6bd7483424eb145efd4d3c58f6abb files/digest-xcircuit-3.1.31 64
 MD5 ca649d4969dc9ee0ed87504dbf062042 files/digest-xcircuit-2.5.4 67
diff --git a/app-sci/xcircuit/files/digest-xcircuit-3.1.29 b/app-sci/xcircuit/files/digest-xcircuit-3.1.29
deleted file mode 100644
index d5cc28604bca..000000000000
--- a/app-sci/xcircuit/files/digest-xcircuit-3.1.29
+++ /dev/null
@@ -1 +0,0 @@
-MD5 448c30a3d915536dc01c9eb1fe7c47ae xcircuit-3.1.29.tar.bz2 661537
diff --git a/app-sci/xcircuit/files/digest-xcircuit-3.1.31 b/app-sci/xcircuit/files/digest-xcircuit-3.1.31
new file mode 100644
index 000000000000..b1104b7e0024
--- /dev/null
+++ b/app-sci/xcircuit/files/digest-xcircuit-3.1.31
@@ -0,0 +1 @@
+MD5 e5187648ff88192790736a77370e6e39 xcircuit-3.1.31.tgz 819653
diff --git a/app-sci/xcircuit/xcircuit-2.5.4.ebuild b/app-sci/xcircuit/xcircuit-2.5.4.ebuild
index 48de4335de8f..35df5be57f0b 100644
--- a/app-sci/xcircuit/xcircuit-2.5.4.ebuild
+++ b/app-sci/xcircuit/xcircuit-2.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-2.5.4.ebuild,v 1.13 2003/12/09 18:11:38 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-2.5.4.ebuild,v 1.14 2004/01/05 13:12:30 plasmaroo Exp $
 
 inherit flag-o-matic
 
diff --git a/app-sci/xcircuit/xcircuit-2.5.5.ebuild b/app-sci/xcircuit/xcircuit-2.5.5.ebuild
index 794c1bb83156..b0ac6e4acb80 100644
--- a/app-sci/xcircuit/xcircuit-2.5.5.ebuild
+++ b/app-sci/xcircuit/xcircuit-2.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-2.5.5.ebuild,v 1.4 2003/12/09 18:11:38 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-2.5.5.ebuild,v 1.5 2004/01/05 13:12:30 plasmaroo Exp $
 
 IUSE=""
 
diff --git a/app-sci/xcircuit/xcircuit-3.1.29.ebuild b/app-sci/xcircuit/xcircuit-3.1.29.ebuild
deleted file mode 100644
index 60abee37280d..000000000000
--- a/app-sci/xcircuit/xcircuit-3.1.29.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-3.1.29.ebuild,v 1.2 2003/12/09 18:11:38 lanius Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Circuit drawing and schematic capture program."
-SRC_URI="http://xcircuit.ece.jhu.edu/archive/${P}.tar.bz2"
-HOMEPAGE="http://xcircuit.ece.jhu.edu"
-
-KEYWORDS="x86 ~ppc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/x11
-	virtual/ghostscript"
-
-
-src_compile() {
-
-	aclocal && autoconf || die "Could not recreate configuration files!"
-	econf || die "Configuration failed"
-	make || die
-
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die "Installation failed"
-	dodoc COPYRIGHT README*
-
-}
diff --git a/app-sci/xcircuit/xcircuit-3.1.31.ebuild b/app-sci/xcircuit/xcircuit-3.1.31.ebuild
new file mode 100644
index 000000000000..c4964c77242b
--- /dev/null
+++ b/app-sci/xcircuit/xcircuit-3.1.31.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-3.1.31.ebuild,v 1.1 2004/01/05 13:12:30 plasmaroo Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="Circuit drawing and schematic capture program."
+SRC_URI="http://xcircuit.ece.jhu.edu/archive/${P}.tgz"
+HOMEPAGE="http://xcircuit.ece.jhu.edu"
+
+KEYWORDS="x86 ~ppc"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="virtual/x11
+	virtual/ghostscript
+	tcltk? ( dev-lang/tk )"
+
+src_compile() {
+
+	sed -e '693s:LDFLAGS="":LDFLAGS="-L/usr/X11R6/lib":;694i      LIBS="${LIBS} ${LIB_SPECS}"' -i configure.in
+	aclocal && autoconf || die "Could not recreate configuration files!"
+
+	if [ `use tcltk` ]; then
+		econf --with-tcl --with-tk
+	else
+		econf
+	fi
+
+	if [ `use tcltk` ]; then
+		sed -e '67s/extern //' -i events.c
+		sed -e 's/extern Tcl_Interp/Tcl_Interp/' -i tclxcircuit.c
+		sed -e '2982d; 3069d;' -i xcircuit.c
+		make tcl || die
+	fi
+	make || die
+
+}
+
+src_install () {
+
+	emake DESTDIR=${D} install || die "Installation failed"
+	if [ `use tcltk` ]; then
+		emake DESTDIR=${D} install-tcl || die "Installation failed"
+	fi
+	dodoc COPYRIGHT README*
+
+}