Version bump

6 files changed, 98 insertions, 15 deletions

diff --git a/app-sci/electric/ChangeLog b/app-sci/electric/ChangeLog
index 914671df6408..180b6d006ce2 100644
--- a/app-sci/electric/ChangeLog
+++ b/app-sci/electric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/electric
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/electric/ChangeLog,v 1.13 2004/10/02 15:09:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/electric/ChangeLog,v 1.14 2004/12/03 16:01:56 phosphan Exp $
+
+*electric-7.00 (03 Dec 2004)
+
+  03 Dec 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/7.00-fix-sandbox.patch, +files/7.00-qt.patch, +electric-7.00.ebuild:
+  Version bump
 
   29 Sep 2004; Simon Stelling <blubb@gentoo.org> electric-6.08-r1.ebuild:
   added ~amd64
diff --git a/app-sci/electric/Manifest b/app-sci/electric/Manifest
index 46fbe6203198..cdb259d6ef34 100644
--- a/app-sci/electric/Manifest
+++ b/app-sci/electric/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 386483a2efb3e27f1b3796120c85ca5c electric-7.00.ebuild 818
 MD5 d17c4febf3fb4da588fddfd798508f94 ChangeLog 1924
-MD5 6f8a1bef39a25fe51d2a31709bc89638 electric-6.07.ebuild 710
 MD5 465d41b2deca4c7b9a9cfdc39b5a0e93 electric-6.08-r1.ebuild 944
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 0bcd09959370bd09c26909326c5cc8f1 files/6.08-fix-sandbox-r1.patch 940
-MD5 31522760b841deb101bacf8521455e79 files/6.08-fix-sandbox.patch 962
-MD5 aaf0ac9ca614a144e057e71e2056dace files/6.08-qt.patch 1373
+MD5 6f8a1bef39a25fe51d2a31709bc89638 electric-6.07.ebuild 710
 MD5 360605382817275ccc10068be4fe9da6 files/digest-electric-6.07 66
+MD5 67fe7d0e0440fec38e812682bd6fb218 files/digest-electric-7.00 66
+MD5 31522760b841deb101bacf8521455e79 files/6.08-fix-sandbox.patch 962
+MD5 aaf0ac9ca614a144e057e71e2056dace files/7.00-qt.patch 1373
+MD5 0bcd09959370bd09c26909326c5cc8f1 files/6.08-fix-sandbox-r1.patch 940
 MD5 08ac6be372fdf34293ebc04a592c6063 files/digest-electric-6.08-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBXsTGI1lqEGTUzyQRAv8rAKCvLJ/CxTI4mbq+u2w7NFe9iV2/8QCgjjER
-KT4ANYJI/KhxQvvWlsR7Yc8=
-=wTA8
------END PGP SIGNATURE-----
+MD5 aaf0ac9ca614a144e057e71e2056dace files/6.08-qt.patch 1373
diff --git a/app-sci/electric/electric-7.00.ebuild b/app-sci/electric/electric-7.00.ebuild
new file mode 100644
index 000000000000..4478677ec570
--- /dev/null
+++ b/app-sci/electric/electric-7.00.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/electric/electric-7.00.ebuild,v 1.1 2004/12/03 16:01:56 phosphan Exp $
+
+inherit eutils
+
+IUSE="qt"
+
+DESCRIPTION="Electric is a sophisticated electrical CAD system that can  handle many forms of circuit design"
+HOMEPAGE="http://www.gnu.org/software/electric/electric.html"
+SRC_URI="http://ftp.gnu.org/pub/gnu/electric/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="virtual/libc
+	!qt? ( x11-libs/openmotif )
+	qt? ( >=x11-libs/qt-3.1 )"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${PV}-fix-sandbox.patch
+	use qt && epatch ${FILESDIR}/${PV}-qt.patch
+}
+
+src_compile() {
+	econf || die "./configure failed"
+	sed -e 's:/usr/local/:/usr/:g' -i src/include/config.h
+	emake OPTIMIZE="${CXXFLAGS}" || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ChangeLog COPYING README
+}
diff --git a/app-sci/electric/files/7.00-fix-sandbox.patch b/app-sci/electric/files/7.00-fix-sandbox.patch
new file mode 100644
index 000000000000..29c36543126e
--- /dev/null
+++ b/app-sci/electric/files/7.00-fix-sandbox.patch
@@ -0,0 +1,11 @@
+--- Makefile.in	2004-12-03 16:27:37.000000000 +0100
++++ Makefile.in.new	2004-12-03 16:38:28.203830495 +0100
+@@ -936,7 +936,7 @@
+ 	rm -f src/vhdl/*~ src/vhdl/"#"*"#"
+ 
+ install: all
+-	$(INSTALL) -d -m755 @bindir@ $(DESTDIR)@datadir@/electric/lib
++	$(INSTALL) -d -m755 ${DESTDIR}/@bindir@ $(DESTDIR)@datadir@/electric/lib
+ 	$(INSTALL) -m755 $(PROGNAME) $(DESTDIR)@bindir@/$(PROGNAME)
+ 	$(INSTALL) -m644 lib/.cadrc $(DESTDIR)@datadir@/electric/lib
+ 	@(cd lib ; \
diff --git a/app-sci/electric/files/7.00-qt.patch b/app-sci/electric/files/7.00-qt.patch
new file mode 100644
index 000000000000..137f1e943642
--- /dev/null
+++ b/app-sci/electric/files/7.00-qt.patch
@@ -0,0 +1,35 @@
+--- Makefile.in.oric	2004-03-15 10:31:14.000000000 +1030
++++ Makefile.in	2004-03-15 10:39:14.000000000 +1030
+@@ -1,10 +1,10 @@
+ ########################################################## USING QT
+ ##### If using Qt, uncomment these five lines
+-# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS)
+-# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS)
+-# GRAPH_OBJS = $(GRAPH_OBJS_QT)
+-# GRAPH_SRC = $(GRAPH_SRC_QT)
+-# CCOMPILER = @CXX@
++GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS)
++GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS)
++GRAPH_OBJS = $(GRAPH_OBJS_QT)
++GRAPH_SRC = $(GRAPH_SRC_QT)
++CCOMPILER = @CXX@
+ 
+ ##### Qt on UNIX/Linux: uncomment the next two lines:
+ ELECTRIC_TARGET = electric-target-unix
+@@ -20,11 +20,11 @@
+ 
+ ########################################################### USING MOTIF
+ ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines
+-GRAPH_FLAGS = @X_CFLAGS@
+-GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
+-GRAPH_OBJS = $(GRAPH_OBJS_XT)
+-GRAPH_SRC = $(GRAPH_SRC_XT)
+-CCOMPILER = @PTHREAD_CC@
++#GRAPH_FLAGS = @X_CFLAGS@
++#GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11
++#GRAPH_OBJS = $(GRAPH_OBJS_XT)
++#GRAPH_SRC = $(GRAPH_SRC_XT)
++#CCOMPILER = @PTHREAD_CC@
+ 
+ ##### For the general-purpose X facility, uncomment this line
+ XPOWER = -DANYDEPTH
diff --git a/app-sci/electric/files/digest-electric-7.00 b/app-sci/electric/files/digest-electric-7.00
new file mode 100644
index 000000000000..a1517b7a0653
--- /dev/null
+++ b/app-sci/electric/files/digest-electric-7.00
@@ -0,0 +1 @@
+MD5 64c89f820467b418d24ddf6c7e206c08 electric-7.00.tar.gz 4474722