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

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

5 files changed, 86 insertions, 55 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/Manifest b/sci-electronics/xcircuit/Manifest
index 5c956a045d09..6b20b1ddd3a2 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xcircuit-3.6.165-implicit.patch 276 RMD160 63c8f02e97a90850c5d2c43939476ad893a96a2c SHA1 7644c677676b144e5e593ff8c75a433b3620df8b SHA256 d3dae14075a7a6d4b387dc901f101461f8d29db52202f4932091e65dc80c4ccc
-DIST xcircuit-3.4.30.tgz 1055721 RMD160 fc6006336d698c49f5e12f4dd889b2c523ad68dd SHA1 778d903f3daf2642be36d6a2c9a93dee8278b13d SHA256 67b58e86f5c69dfe14872b00e743b21150804df60ad33da30533e0fd18e828d8
-DIST xcircuit-3.6.165.tgz 1458622 RMD160 f3234741de5624223ea03a86065c9a0cc31dc948 SHA1 659503dcc0d12460fffc7f281a045db0945b6d77 SHA256 8910859834f1d18b50382c67580867e254a5b0ab3e128d1ddd9bfbf82dfd8c9f
-DIST xcircuit-3.7.39.tgz 1507600 RMD160 38fa6ba7ea756aa1938f795d52bcb83138cbd2a7 SHA1 2e252907402253cf92de2814c6e96e641e07c119 SHA256 e351dfe0ab8f55b78e4db41ade03b8f27059d01d620d44b6353ad223d84e1af3
-DIST xcircuit-3.7.40.tgz 1507559 RMD160 29b538e113d5ff9910a80f7bb20245f9749b9eb6 SHA1 3562060049044467a896700ac9438e6359e78443 SHA256 4a69da977b13426c62d65eb6d49ec7c6863b4a1c84b58bf26d45b346599d9414
-DIST xcircuit-3.8.24.tgz 1516039 RMD160 7b94185b904b9717ff46d5ac288e084074a70e6d SHA1 a93b72314c59c3b93e92fb9960757c26c3b9d219 SHA256 05963b59f2ffffd3fa360ad0bee828dacf9dc160739735ebb222b8321bd500b3
-EBUILD xcircuit-3.4.30.ebuild 991 RMD160 887826ce5224870f2232f0696f882a61239c8278 SHA1 805769d87692fcb923a20e37cca8ad805c1c0af6 SHA256 aaddf4ad66a4b5099accec7f6319cb1477b137331fcbd525e348f50d83785913
-EBUILD xcircuit-3.6.165.ebuild 1151 RMD160 6e388fde4bde55741ab7e2804d5692ab2a09b5af SHA1 1f9a97ad8e15ffb31797c1528071b7cb3ad63a83 SHA256 9e538a2ef9b6f4258face3871087aa1fa18b05f2ecc9d84a32ae96db8bb38ced
-EBUILD xcircuit-3.7.39.ebuild 1167 RMD160 ab44d369b5d8b4bf2be841c2fb1696e6818c5ac0 SHA1 abf0b615ac1d0018e519fbcc90eff2dbe81501c4 SHA256 9584f69d97b8f1695932875b94593a1efd7f46e7dd086af777dc0cf7106daa9e
-EBUILD xcircuit-3.7.40.ebuild 1170 RMD160 e3dc272d8402009d8da9143d2a51c0ecf41d8f5b SHA1 e67a961af870a92834982906e7594079e3561b02 SHA256 6381731c5da583bc31083b0ad5e1fcdaf6cb37f4b1a0ebcd3b0cdd1b65a56cd4
-EBUILD xcircuit-3.8.24.ebuild 1191 RMD160 22a00fd7f4d4a07575ba7177404d5cb4f67bf519 SHA1 5d2442369befb30b7d68744a3985c11fd23b7407 SHA256 3ffe3b1856eeda8c7f0b9055d47c1c1acf6b5d30af1f0cd3ea8eacb5c2a3ef48
-MISC ChangeLog 10444 RMD160 2f62130fa6b8375529afa82f5015561d7befea0a SHA1 140e424fd33ce3a5a9b496dcd98f57bcbf1eb9e3 SHA256 65fdc2f70434e2f80feaa7ad0112c420306bcbc753595a95fad1fe12d3535c6f
-MISC metadata.xml 781 RMD160 d5b7dfeb9d89ad3877f6a991ab07194bbff6d31d SHA1 1dd63a3bf686a0dbfaff3a45f7b1038c7870d73d SHA256 c162f1e5686f96a2bf2f769a58f076b4ea4ac98ddfc7c4ccdbd6618df88f7dbf
+AUX xcircuit-3.6.165-implicit.patch 276 SHA256 d3dae14075a7a6d4b387dc901f101461f8d29db52202f4932091e65dc80c4ccc SHA512 ec2a4bc459b11c265be48bbaa758034a4d8d910e29bb87b7fd19d198f49615744a14c83417b17dc289a33c0e544a900bb860a140ef349486caca8c8ab22aa967 WHIRLPOOL d7b6b968d1ee630e9fbc1d5b7bc8e291659b85c6d2ce98c4f6c7195c7f71497d38483bd4da21bfa7a991b23553a0c034a9cedf847a7ccb35d566e243e43cdfb0
+DIST xcircuit-3.4.30.tgz 1055721 SHA256 67b58e86f5c69dfe14872b00e743b21150804df60ad33da30533e0fd18e828d8
+DIST xcircuit-3.6.165.tgz 1458622 SHA256 8910859834f1d18b50382c67580867e254a5b0ab3e128d1ddd9bfbf82dfd8c9f
+DIST xcircuit-3.7.39.tgz 1507600 SHA256 e351dfe0ab8f55b78e4db41ade03b8f27059d01d620d44b6353ad223d84e1af3
+DIST xcircuit-3.7.40.tgz 1507559 SHA256 4a69da977b13426c62d65eb6d49ec7c6863b4a1c84b58bf26d45b346599d9414 SHA512 1baae93b627f9f1bc2c6ac2ca17dd2a1b7d900ee1990bb84e4778f008c9128ebac01bcedeaba5e36ca9b94e444a696d5e5003440fcaff3c1b10f52cf355d7652 WHIRLPOOL d937d85dcab200927f8ad46f6a6197e8e82706e58e123d7abc8af596aa924f1e9426c1c090dcde2a794b1cac4dd0154b5aa24e93972c4cacef5ff935f129b06c
+DIST xcircuit-3.8.24.tgz 1516039 SHA256 05963b59f2ffffd3fa360ad0bee828dacf9dc160739735ebb222b8321bd500b3 SHA512 c3970e6adb05b1ef00f17f898447cbca0a940241000c96491d86d9073878d72492d5e7260b4b5cb015b87f5c3664a17d7a42d5ad753b1b065b27c62d9d3866f7 WHIRLPOOL 01aa765a228acb57606e423df237fbbcdb686e4d94f5952965754eb207ce7e310297642880581758c17ce1e1098c2728dc5fa2e9319c1f7d6ee841206b494d31
+EBUILD xcircuit-3.4.30.ebuild 991 SHA256 aaddf4ad66a4b5099accec7f6319cb1477b137331fcbd525e348f50d83785913 SHA512 9dc5cfc0e2b0ae1ae55d864c85c8e59f2a46d382271eff46e5602cde796a2ce9cdb867bc480ec46d5b87b5efae9d33f0c43fda055dcdb38e7d7b513f3d3cbb4c WHIRLPOOL 502eaeda6a5cde0b17a1f22de68a3545c5b6465ceea5442490ddfb2f6f1893541c1706b092a0803715e54d2c5dac1ee9ce357c62eb0eb650f0ca111c590f0755
+EBUILD xcircuit-3.6.165.ebuild 1151 SHA256 9e538a2ef9b6f4258face3871087aa1fa18b05f2ecc9d84a32ae96db8bb38ced SHA512 b354c427cafc41bd68c79a56ba5ee3b050776b88eaa5045f681e502e3bbfa5420a5085998fdb6981794bfd90d2d3bd201e11dfe78306e5ea5fd3e8f8d7083b24 WHIRLPOOL c7e3895d070791d40ed40772cc7869687ccfb3ca8ed8f62d9030651628f7f20241c60d1565f3e1d2072938fa64457cb4da9837c012be54306de7b904e5767d39
+EBUILD xcircuit-3.7.39.ebuild 1167 SHA256 9584f69d97b8f1695932875b94593a1efd7f46e7dd086af777dc0cf7106daa9e SHA512 fb2f3f006aba5a4475065e93ca76c4d50cfb2a356dc7bb025119cdefd523666e5ce9e41717766476e8a0f7f0112df83a85c7e5a10e10bdd2735092379f07be6c WHIRLPOOL 3c69724941e6a6e66e339048c3ddb17e1e031e0e6cebe1f0ac229b5f8ed01d721e94886bb2a8517dc5c94ac415dc302bf1994311befc5787e805ce93076274c8
+EBUILD xcircuit-3.7.40.ebuild 1334 SHA256 05dea3703535ffa8f5c7b06a5172c3bab46470106bd378833cc290b522426671 SHA512 a439a3a5e44b6d8675217db1ec381f78b19d13f0e440580ba50ca8ef170f1dc8f154f2477287781743faa18f306f268824487dafc0e5d1cb6533a5fc65921e41 WHIRLPOOL d5cb46ff40b45d1fc6845eb42c072d86b9405a140d9041137b1e29a9adf2cd8f6fc90ebd92ec15d8532077faec863db05e3dff90199a2d05cd9ce974f3832026
+EBUILD xcircuit-3.8.24.ebuild 1334 SHA256 e5d5191b0b6da6f602b9ced65d671512bebdc25969af2a662342cf203bed9ee9 SHA512 d8b2c6b5e3eb65d126cedbcfa73bb900f8a07030a69844d4d70711452f0b3eec41b0b666b7a40f73c4c941f93676d986c18e2b87880c500c24cbade37b78cb19 WHIRLPOOL f93dd0ae59ae5f0a0fe4a4024063387a87bfcb22e09bd918a0f63d0f1e4d5c80a174f218948ff29ecb771063ce95ee9d8f04ce8d3fc63cf7b57942fdd9af31ce
+MISC ChangeLog 10678 SHA256 e0bc5bfef3668dc6b9e660093a2d9c047836d6b013a62f4b5f5b20e354acc8a7 SHA512 0665e9eb05a65b011a8227462f69505910ea846049ced3b914ec49a4df5f9636c48b8edee568878e153d51e3569c1acd6158d73e9a188d100afca4252312d07e WHIRLPOOL 98b75b385abe9ef3926021a9ea2dd8c6ea6d93fce80919baf9c23d797c26a6d69ed7d6b3a06acb9ecf503af0778aebac0cf264d72e09427afb2cfaa3f3ecc4ee
+MISC metadata.xml 779 SHA256 45f0224012e2e5684097c3edcdeb84cc92421eb06b5baa73dc55932d73f28da1 SHA512 c37de2527ce33d71a4b1e6c4c45cd1d209e3ea529de1be4b9a13cd6f7bc39eeefcbbbd98381a6ddfbcb010fd402f4a4f6d6b7fda468df59a3091aaae706a120e WHIRLPOOL 3bca10e5dee46959103166b2565cf2f8aa4ba64d632cdf0b9c2da5b0d6f4898eda1a95ba2720cfabb4437256e43b3413543f3d4cc4269be679de2044a7c5a4d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iF4EAREIAAYFAk/f1xAACgkQknrdDGLu8JCc1wD/feL4NIo7RHfx1DQjssiNk6GJ
-KrxzrtxFhbTNvSzyqwwA/jhN4YeJ1OtY9s5dFdZwt1aC44faIvEVcxTtuMjilsgi
-=BoaW
+iEYEAREIAAYFAk/9xNsACgkQgAnW8HDreRaTLQCdE4lHXc3vntPCDyuyIbxm7Vpr
+c9wAn27K/QcTc2SQxQWjNxmuZx+/kEF9
+=AT6t
 -----END PGP SIGNATURE-----
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"
 }