Adding IUSE, moving patch -> epatch

6 files changed, 16 insertions, 15 deletions

diff --git a/app-sci/xcircuit/ChangeLog b/app-sci/xcircuit/ChangeLog
index a847e86a589a..0b90c3689ba7 100644
--- a/app-sci/xcircuit/ChangeLog
+++ b/app-sci/xcircuit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-sci/xcircuit
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/ChangeLog,v 1.13 2004/04/19 12:55:01 phosphan Exp $
+
+  19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> xcircuit-2.5.4.ebuild,
+  xcircuit-2.5.5.ebuild, xcircuit-3.1.31.ebuild,
+  files/xcircuit-2.5.4-XQueryColor.patch, files/xcircuit-2.5.4-sigsegv.patch:
+  Adding IUSE, moving patch -> epatch
 
 *xcircuit-3.1.31 (05 Jan 2004)
 
diff --git a/app-sci/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch b/app-sci/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch
index 001c50692ed7..098d302dc93f 100644
--- a/app-sci/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch
+++ b/app-sci/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch
@@ -1,4 +1,4 @@
---- xcircuit.c.orig	2002-03-20 14:00:50.000000000 -0800
+--- 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);
diff --git a/app-sci/xcircuit/files/xcircuit-2.5.4-sigsegv.patch b/app-sci/xcircuit/files/xcircuit-2.5.4-sigsegv.patch
index 171931300bf4..cce4b5ae7816 100644
--- a/app-sci/xcircuit/files/xcircuit-2.5.4-sigsegv.patch
+++ b/app-sci/xcircuit/files/xcircuit-2.5.4-sigsegv.patch
@@ -1,4 +1,4 @@
---- files.c.orig	2002-03-26 13:12:18.000000000 -0800
+--- 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;
diff --git a/app-sci/xcircuit/xcircuit-2.5.4.ebuild b/app-sci/xcircuit/xcircuit-2.5.4.ebuild
index 35df5be57f0b..20a2f32493a6 100644
--- a/app-sci/xcircuit/xcircuit-2.5.4.ebuild
+++ b/app-sci/xcircuit/xcircuit-2.5.4.ebuild
@@ -1,16 +1,15 @@
 # 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.14 2004/01/05 13:12:30 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-2.5.4.ebuild,v 1.15 2004/04/19 12:55:01 phosphan Exp $
 
-inherit flag-o-matic
-
-S=${WORKDIR}/${P}
+inherit flag-o-matic eutils
 
 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"
 
@@ -25,11 +24,11 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	patch xcircuit.c < ${FILESDIR}/${PN}-${PV}-XQueryColor.patch || die "patch failed"
+	epatch ${FILESDIR}/${PN}-${PV}-XQueryColor.patch
 
 	#only apply this patch if under gcc-3.2
 	if [ "`gcc -dumpversion | cut -d. -f1,2`" == "3.2" ]; then
-		patch files.c <${FILESDIR}/${PN}-${PV}-sigsegv.patch || die "patch failed"
+		epatch ${FILESDIR}/${PN}-${PV}-sigsegv.patch
 	fi
 
 }
diff --git a/app-sci/xcircuit/xcircuit-2.5.5.ebuild b/app-sci/xcircuit/xcircuit-2.5.5.ebuild
index b0ac6e4acb80..20817858391c 100644
--- a/app-sci/xcircuit/xcircuit-2.5.5.ebuild
+++ b/app-sci/xcircuit/xcircuit-2.5.5.ebuild
@@ -1,18 +1,17 @@
 # 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.5 2004/01/05 13:12:30 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-2.5.5.ebuild,v 1.6 2004/04/19 12:55:01 phosphan Exp $
 
 IUSE=""
 
 inherit flag-o-matic
 
-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"
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-sci/xcircuit/xcircuit-3.1.31.ebuild b/app-sci/xcircuit/xcircuit-3.1.31.ebuild
index c4964c77242b..62d77095e48a 100644
--- a/app-sci/xcircuit/xcircuit-3.1.31.ebuild
+++ b/app-sci/xcircuit/xcircuit-3.1.31.ebuild
@@ -1,8 +1,6 @@
 # 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}
+# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-3.1.31.ebuild,v 1.2 2004/04/19 12:55:01 phosphan Exp $
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://xcircuit.ece.jhu.edu/archive/${P}.tgz"