sci-electronics/xcircuit: Add fix for atumake-1.12, #425746; add fix for automake-1.13; move to EAPI=4 and autotools-utils; drop implicit deps

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

4 files changed, 68 insertions, 38 deletions

diff --git a/sci-electronics/xcircuit/ChangeLog b/sci-electronics/xcircuit/ChangeLog
index e3b4a4226b4c..f2b39a376889 100644
--- a/sci-electronics/xcircuit/ChangeLog
+++ b/sci-electronics/xcircuit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/xcircuit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.55 2012/06/19 01:34:43 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.56 2012/07/11 18:24:21 jlec Exp $
+
+  11 Jul 2012; Justin Lecher <jlec@gentoo.org> xcircuit-3.7.40.ebuild,
+  xcircuit-3.8.24.ebuild, metadata.xml:
+  Add fix for atumake-1.12, #425746; add fix for automake-1.13; move to EAPI=4
+  and autotools-utils; drop implicit deps
 
   19 Jun 2012; Michael Weber <xmw@gentoo.org> xcircuit-3.7.39.ebuild:
   ppc stable (bug 420981)
diff --git a/sci-electronics/xcircuit/metadata.xml b/sci-electronics/xcircuit/metadata.xml
index 466ac69c04dd..feb3585e3d7a 100644
--- a/sci-electronics/xcircuit/metadata.xml
+++ b/sci-electronics/xcircuit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
-  <longdescription>
+	<herd>sci-electronics</herd>
+	<longdescription>
   XCircuit is a UNIX/X11 program for drawing publishable-quality electrical
   circuit schematic diagrams and related figures, and produce circuit netlists
   through schematic capture. XCircuit regards circuits as inherently
diff --git a/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild b/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild
index 3c0e4fa29526..0bf43da35bd1 100644
--- a/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild,v 1.1 2012/06/13 13:10:02 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild,v 1.2 2012/07/11 18:24:21 jlec Exp $
 
-EAPI=2
-inherit autotools eutils multilib
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
@@ -14,37 +17,47 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="x11-libs/libX11
+DEPEND="
+	app-text/ghostscript-gpl
+	dev-lang/tk
+	sys-libs/zlib
+	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXpm
 	x11-libs/libSM
-	x11-libs/libICE
-	sys-libs/zlib
-	app-text/ghostscript-gpl
-	dev-lang/tcl
-	dev-lang/tk"
+	x11-libs/libICE"
 RDEPEND=${DEPEND}
 
 RESTRICT="test" #131024
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 src_prepare() {
-	eautoreconf		# avoid QA-warning wrt automaintainer mode
+	# automake-1.12
+	sed \
+		-e '/AM_C_PROTOTYPES/d' \
+		-i configure.in || die
+	# automake-1.13
+	mv configure.{in,ac} || die
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	export loader_run_path="/usr/$(get_libdir)"
-	econf \
-		--disable-dependency-tracking \
-		--with-tcl \
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--with-tcl
 		--with-ngspice
+	)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	emake appdefaultsdir="/usr/share/X11/app-defaults" || die
+	autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
 }
 
 src_install () {
-	emake DESTDIR="${D}" appdefaultsdir="/usr/share/X11/app-defaults" \
-		appmandir="/usr/share/man/man1" install || die
-	dodoc CHANGES README* TODO
+	autotools-utils_src_install \
+		appdefaultsdir="/usr/share/X11/app-defaults" \
+		appmandir="/usr/share/man/man1"
 }
diff --git a/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild b/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild
index 33c6dd36434b..c5fe6b117777 100644
--- a/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild,v 1.1 2012/06/13 13:14:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild,v 1.2 2012/07/11 18:24:21 jlec Exp $
 
-EAPI=2
-WANT_AUTOMAKE="1.11"
-inherit autotools eutils multilib
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
 
 DESCRIPTION="Circuit drawing and schematic capture program."
 SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
@@ -15,37 +17,47 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="x11-libs/libX11
+DEPEND="
+	app-text/ghostscript-gpl
+	dev-lang/tk
+	sys-libs/zlib
+	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXpm
 	x11-libs/libSM
-	x11-libs/libICE
-	sys-libs/zlib
-	app-text/ghostscript-gpl
-	dev-lang/tcl
-	dev-lang/tk"
+	x11-libs/libICE"
 RDEPEND=${DEPEND}
 
 RESTRICT="test" #131024
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 src_prepare() {
-	eautoreconf		# avoid QA-warning wrt automaintainer mode
+	# automake-1.12
+	sed \
+		-e '/AM_C_PROTOTYPES/d' \
+		-i configure.in || die
+	# automake-1.13
+	mv configure.{in,ac} || die
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	export loader_run_path="/usr/$(get_libdir)"
-	econf \
-		--disable-dependency-tracking \
-		--with-tcl \
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--with-tcl
 		--with-ngspice
+	)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	emake appdefaultsdir="/usr/share/X11/app-defaults" || die
+	autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
 }
 
 src_install () {
-	emake DESTDIR="${D}" appdefaultsdir="/usr/share/X11/app-defaults" \
-		appmandir="/usr/share/man/man1" install || die
-	dodoc CHANGES README* TODO
+	autotools-utils_src_install \
+		appdefaultsdir="/usr/share/X11/app-defaults" \
+		appmandir="/usr/share/man/man1"
 }