6 files changed, 61 insertions, 51 deletions
diff --git a/sci-electronics/xcircuit/ChangeLog b/sci-electronics/xcircuit/ChangeLog
index 376489ff13ea..07ab2813775c 100644
--- a/sci-electronics/xcircuit/ChangeLog
+++ b/sci-electronics/xcircuit/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2005/04/14 15:22:17 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.6 2005/12/22 23:02:19 plasmaroo Exp $
+
+*xcircuit-3.4.10 (22 Dec 2005)
+
+  22 Dec 2005; <plasmaroo@gentoo.org> -xcircuit-2.5.5.ebuild,
+  +xcircuit-3.4.10.ebuild:
+  Remove obsolete 2.5.5; add 3.4.10.
 
   14 Apr 2005; Tom Martin <slarti@gentoo.org> xcircuit-3.3.10.ebuild:
   -m Marked ~amd64.
diff --git a/sci-electronics/xcircuit/Manifest b/sci-electronics/xcircuit/Manifest
index fc43cb028c08..e9fd93ba6c46 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fefadd42bab965f2ca1a51ce38b982b6 ChangeLog 3548
-MD5 cec9ebc1cf60c51f5217db48c29e1a36 xcircuit-3.3.10.ebuild 1212
-MD5 c2684ade783a66cb46cf71e70a766aa0 xcircuit-3.1.31.ebuild 1203
+MD5 7fc3774a739fa6188a9f5b65ea37b401 ChangeLog 3710
 MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
-MD5 fd27b44a3608def0651ef81b60154044 xcircuit-2.5.5.ebuild 818
-MD5 3f779f7efbaa50b91424a66a5a4ff08e files/digest-xcircuit-2.5.5 67
+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 89d6bd7483424eb145efd4d3c58f6abb files/digest-xcircuit-3.1.31 64
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCXotpCHk4+ZoBpvsRAhVyAJ4lcl/LivEplXN7GgWmi6BlKsBaTwCgxIIZ
-AprbmqJCLdmqtW7UuRKmaUo=
-=hFva
------END PGP SIGNATURE-----
diff --git a/sci-electronics/xcircuit/files/digest-xcircuit-2.5.5 b/sci-electronics/xcircuit/files/digest-xcircuit-2.5.5
deleted file mode 100644
index d234949b4c86..000000000000
--- a/sci-electronics/xcircuit/files/digest-xcircuit-2.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d96cf74f3d39245bf711e67d77b06d49 xcircuit-2.5.5.tar.bz2 523555
diff --git a/sci-electronics/xcircuit/files/digest-xcircuit-3.4.10 b/sci-electronics/xcircuit/files/digest-xcircuit-3.4.10
new file mode 100644
index 000000000000..5e30708d2714
--- /dev/null
+++ b/sci-electronics/xcircuit/files/digest-xcircuit-3.4.10
@@ -0,0 +1 @@
+MD5 ec2d2d771b5ffaf996ae00b8da1e62b4 xcircuit-3.4.10.tgz 983183
diff --git a/sci-electronics/xcircuit/xcircuit-2.5.5.ebuild b/sci-electronics/xcircuit/xcircuit-2.5.5.ebuild
deleted file mode 100644
index 25634223a67b..000000000000
--- a/sci-electronics/xcircuit/xcircuit-2.5.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-2.5.5.ebuild,v 1.2 2005/02/05 11:15:08 hansmi Exp $
-
-inherit flag-o-matic
-
-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"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/x11
-		dev-lang/python
-		virtual/ghostscript"
-
-#looks like -O3 causes problems at times
-replace-flags -O3 -O2
-
-src_compile() {
-	econf || die "./configure failed"
-
-	#Parallel make bombs on parameter.c looking for menudep.h
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "Installation failed"
-	dodoc COPYRIGHT README*
-}
diff --git a/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild b/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild
new file mode 100644
index 000000000000..6891bce8663e
--- /dev/null
+++ b/sci-electronics/xcircuit/xcircuit-3.4.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 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 $
+
+DESCRIPTION="Circuit drawing and schematic capture program."
+SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
+HOMEPAGE="http://opencircuitdesign.com/xcircuit"
+
+KEYWORDS="~x86 ~ppc ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="tcltk"
+
+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 || die "econf failed"
+	else
+		econf || die "econf failed"
+	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*
+
+}