The fix-sandbox patch tweaked paths a little too much, see bug #50763

5 files changed, 72 insertions, 2 deletions

diff --git a/app-sci/electric/ChangeLog b/app-sci/electric/ChangeLog
index 408d7329c37a..110e6fa85e91 100644
--- a/app-sci/electric/ChangeLog
+++ b/app-sci/electric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/electric
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-sci/electric/ChangeLog,v 1.6 2004/04/19 15:23:16 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/electric/ChangeLog,v 1.7 2004/05/12 05:47:31 phosphan Exp $
+
+*electric-6.08-r1 (12 May 2004)
+
+  12 May 2004; Patrick Kursawe <phosphan@gentoo.org> electric-6.08-r1.ebuild,
+  files/6.08-fix-sandbox-r1.patch:
+  The fix-sandbox patch tweaked paths a little too much, see bug #50763
 
 *electric-6.08 (19 Apr 2004)
 
diff --git a/app-sci/electric/Manifest b/app-sci/electric/Manifest
index b5ff8fc0f847..019188d02a8e 100644
--- a/app-sci/electric/Manifest
+++ b/app-sci/electric/Manifest
@@ -1,10 +1,13 @@
 MD5 a1daa1dcdce4c1f9079e51d352229ed5 electric-6.07-r1.ebuild 778
 MD5 e870ae0a289b406d9a725e9647cd9be6 electric-6.08.ebuild 945
-MD5 b9c66b26c4e3055527ba981f2b412079 ChangeLog 1236
+MD5 2debb2e63206c1ba4e0fc3e0703d1c1b ChangeLog 1455
+MD5 d50d5cad723320dc947656929ee4069e electric-6.08-r1.ebuild 951
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 c56b6fd870a5bd605746803e6c76ea3c electric-6.07.ebuild 715
 MD5 360605382817275ccc10068be4fe9da6 files/digest-electric-6.07 66
 MD5 08ac6be372fdf34293ebc04a592c6063 files/digest-electric-6.08 66
 MD5 31522760b841deb101bacf8521455e79 files/6.08-fix-sandbox.patch 962
+MD5 0bcd09959370bd09c26909326c5cc8f1 files/6.08-fix-sandbox-r1.patch 940
 MD5 360605382817275ccc10068be4fe9da6 files/digest-electric-6.07-r1 66
+MD5 08ac6be372fdf34293ebc04a592c6063 files/digest-electric-6.08-r1 66
 MD5 aaf0ac9ca614a144e057e71e2056dace files/6.08-qt.patch 1373
diff --git a/app-sci/electric/electric-6.08-r1.ebuild b/app-sci/electric/electric-6.08-r1.ebuild
new file mode 100644
index 000000000000..49f993b3825e
--- /dev/null
+++ b/app-sci/electric/electric-6.08-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/electric/electric-6.08-r1.ebuild,v 1.1 2004/05/12 05:47:32 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 ~ppc"
+
+DEPEND="virtual/glibc
+	!qt? ( x11-libs/openmotif )
+	qt? ( >=x11-libs/qt-3.1 )"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${PV}-fix-sandbox-r1.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 || die
+}
+
+src_install() {
+	einstall DESTDIR="${D}"
+
+	dodoc ChangeLog COPYING README
+}
diff --git a/app-sci/electric/files/6.08-fix-sandbox-r1.patch b/app-sci/electric/files/6.08-fix-sandbox-r1.patch
new file mode 100644
index 000000000000..5a8316d37494
--- /dev/null
+++ b/app-sci/electric/files/6.08-fix-sandbox-r1.patch
@@ -0,0 +1,23 @@
+--- Makefile.in.oric	2004-03-15 10:31:14.000000000 +1030
++++ Makefile.in	2004-03-15 10:31:27.000000000 +1030
+@@ -932,15 +932,15 @@
+ 	rm -f src/vhdl/*~ src/vhdl/"#"*"#"
+ 
+ install: all
+-	$(INSTALL) -d -m755 @bindir@ /usr/share/electric/lib
+-	$(INSTALL) -m755 $(PROGNAME) @bindir@/$(PROGNAME)
+-	$(INSTALL) -m644 lib/.cadrc /usr/share/electric/lib
++	$(INSTALL) -d -m755 @bindir@ ${DESTDIR}/@datadir@/electric/lib
++	$(INSTALL) -m755 $(PROGNAME) @bindir@/$(PROGNAME)
++	$(INSTALL) -m644 lib/.cadrc ${DESTDIR}/@datadir@/electric/lib
+ 	@(cd lib ; \
+ 	for d in `$(FIND) . -type d -print`; do \
+-	  $(INSTALL) -d -m755 /usr/share/electric/lib/$$d ; \
++	  $(INSTALL) -d -m755 ${DESTDIR}/@datadir@/electric/lib/$$d ; \
+ 	  (cd $$d ; \
+ 	  for f in `$(FIND) . -type f -maxdepth 1 -print`; do \
+-	    install -m644 $$f /usr/share/electric/lib/$$d/$$f ; \
++	    install -m644 $$f ${DESTDIR}/@datadir@/electric/lib/$$d/$$f ; \
+ 	  done ) ; \
+ 	done ) ; 
+ 
diff --git a/app-sci/electric/files/digest-electric-6.08-r1 b/app-sci/electric/files/digest-electric-6.08-r1
new file mode 100644
index 000000000000..75dcd5f32194
--- /dev/null
+++ b/app-sci/electric/files/digest-electric-6.08-r1
@@ -0,0 +1 @@
+MD5 de428032f08d3d3ee8686f178ae6b160 electric-6.08.tar.gz 4386249