upstream maintainer, version bumps, drop old.

Package-Manager: portage-2.2.0_alpha175/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 153 insertions, 69 deletions

diff --git a/sci-electronics/xcircuit/ChangeLog b/sci-electronics/xcircuit/ChangeLog
index 4eb868d6f05b..342792bd949a 100644
--- a/sci-electronics/xcircuit/ChangeLog
+++ b/sci-electronics/xcircuit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-electronics/xcircuit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.63 2013/05/16 13:10:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/ChangeLog,v 1.64 2013/05/24 06:23:57 xmw Exp $
+
+*xcircuit-3.7.49 (24 May 2013)
+*xcircuit-3.8.39 (24 May 2013)
+
+  24 May 2013; Michael Weber <xmw@gentoo.org> +xcircuit-3.7.49.ebuild,
+  +xcircuit-3.8.39.ebuild, -xcircuit-3.7.39.ebuild, metadata.xml:
+  upstream maintainer, version bumps, drop old.
 
   16 May 2013; Agostino Sarubbo <ago@gentoo.org> xcircuit-3.7.48.ebuild:
   Stable for ppc, wrt bug #469920
diff --git a/sci-electronics/xcircuit/Manifest b/sci-electronics/xcircuit/Manifest
index d723a8a7783d..b31e9e54d79b 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,33 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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.48.tgz 1648993 SHA256 4d6e7cb155f41d2643e9d1a07865de49aa31cbd238a951ac5d74e13e4c03457b SHA512 686bd2139a6d2d5011b51ff500ea9ffb4007326734eafc0afeec250cb844d8107a344c4ef90d2ed747d8485e7dc8dca69c7e62fd785fc17d3f3460212a0dcb84 WHIRLPOOL 6f935190c7a95e3d4dac48090efa18418ca9e6e8e345f23a27da35debf0aeae7ca1223e1b2e975cce1619d3f2ff878e72a0cd3bee103624214955397c40739ce
+DIST xcircuit-3.7.49.tgz 1649013 SHA256 a37e6b3baa4fb13f12bb14b27856dd71eda7620f755bb5532f76e747f3b73738 SHA512 930f00c507d422a50cfb9c4e9bbe74f0cb3b8c971ce50aec8b77a45db4e2b46ab45598d4cebfaaeab5e06b2f65a750506af39b4016042ee13409e0ac6141bcfb WHIRLPOOL cee63a6444be6bff5b1f4f33f47da9ded551c958136d105fe954785efdfb61253cd2e68d29f7262c13753a2b1c0dbb3939c1e565aca41f074c6f898889bafe25
 DIST xcircuit-3.8.38.tgz 1517058 SHA256 b39a5cb960b637caa2bf2b8a22a74d5ac8d864a2fd370834ae63dbda618db4d1 SHA512 daf303a06fa1f406eefa372c2c244d372924c24c706b589967c50512cbe3e40d086750ee1e5cfbc22556d66955a75349ce1d7651d4b5f84ee8a7225ade5a7927 WHIRLPOOL 525ca405f9c47a4716784f4ff011a90a0f070b42d07815ce79e623b20997c9871cb77c2766c970bc4dab17d6ba30bf418dd7f4ab5deaf123883913ac430b64d1
+DIST xcircuit-3.8.39.tgz 1517080 SHA256 2ab1540a4ad84e0df8e4e5ce2f33d58a3d0bb8798ec42e401b3daf7384cfea18 SHA512 d700f98cd3fe22d05deea31b839369238c8886e0e6c5b624ba2f197f2a1427168b7d95fa70c4821d8a9dcd7868ba78b6a5e3e582be9a944809ac996410ae9f21 WHIRLPOOL af88c995ac0daaec37f9bd3e9a61d3e7699562b9b68f8f69920ffed5fd5d71a20a166f81351ddce38a05011d07a0e8859066ae2a748bb06c79e3db0dcbc518b1
 EBUILD xcircuit-3.4.30.ebuild 991 SHA256 aaddf4ad66a4b5099accec7f6319cb1477b137331fcbd525e348f50d83785913 SHA512 9dc5cfc0e2b0ae1ae55d864c85c8e59f2a46d382271eff46e5602cde796a2ce9cdb867bc480ec46d5b87b5efae9d33f0c43fda055dcdb38e7d7b513f3d3cbb4c WHIRLPOOL 502eaeda6a5cde0b17a1f22de68a3545c5b6465ceea5442490ddfb2f6f1893541c1706b092a0803715e54d2c5dac1ee9ce357c62eb0eb650f0ca111c590f0755
 EBUILD xcircuit-3.6.165.ebuild 1168 SHA256 b1b2354b008fef77c317715ac3904a69b1d74270e7354c6c7c1ebb317c1591b7 SHA512 4aa02e1934570bc29d29b903c1eabcf71398453a474d489996219ff0cc7f3e0b08490740b5b7e568b8ad1426a53979c3b663bebde31c6d590802209f471131c5 WHIRLPOOL e9f5042377df857a33027a47c410454c3c74a43e7ae118afd97e9663bd0ab17ae20a5f8872a658de479219cfefd91c5de0129af0a723a07cdce082cb008bacc4
-EBUILD xcircuit-3.7.39.ebuild 1167 SHA256 9584f69d97b8f1695932875b94593a1efd7f46e7dd086af777dc0cf7106daa9e SHA512 fb2f3f006aba5a4475065e93ca76c4d50cfb2a356dc7bb025119cdefd523666e5ce9e41717766476e8a0f7f0112df83a85c7e5a10e10bdd2735092379f07be6c WHIRLPOOL 3c69724941e6a6e66e339048c3ddb17e1e031e0e6cebe1f0ac229b5f8ed01d721e94886bb2a8517dc5c94ac415dc302bf1994311befc5787e805ce93076274c8
 EBUILD xcircuit-3.7.48.ebuild 1330 SHA256 47f7fa0f8ea70d439002538edf358cd30a32e3262ada330fe9920ed4389c46ab SHA512 bed7fb796afaba80a17d3abf96918442771e0de2d89386e115fc84bc3d02db97e50d610a3abe52c695a02b5bf4791e8b833b85ccd1c7b59055d05e2fc0ebf13f WHIRLPOOL 9b7809f91b3109ee0c358ae84f6725660797a897fba280c1aafc7e588ade6e33d6cd3e4ccc847612b58a04928a6b966a4a68fc3dd40ba766f5efbed7664ee6f1
+EBUILD xcircuit-3.7.49.ebuild 1333 SHA256 f842ccc7b0c06ec00ec66722096a175614659ac96bd1d9ffd90c0563ba610047 SHA512 2e7f3f773b56f4f3a1fdce3b6b8681e587a23253d5e2d7d9a38961ab3d86e0261d68e3d82e2ce46a19e2d4dc13c2b97908a571ff0f429094d229c172a1c436a6 WHIRLPOOL 2cacde22cf18061399dda672dcf9fcbdbf578c71ba94aca168873c5e236c6a8af78fcbebaa83fd810bd53e0ba542d010af18121c685a935609a098f748611041
 EBUILD xcircuit-3.8.38.ebuild 1333 SHA256 bd351dda197d59e2c79e002023fe0fc0f8ca4e4286ceaea695ccd2ef95faf790 SHA512 5a624e793fa8c877aca41c9792db872322f56548490ba4cc19736f14fa721f2c60c3f895416d3644f0614e2908328911e8fcf1657a59ee5afcafd51d02d3317f WHIRLPOOL 60480b11d467128f6eccc4480d21057927a94d2aa8b5810b2b859ef6f6bec5f915f7e967b122be7fb1afefb836b1e0f34b07df5ad28e54ea02f2e5666fa20da4
-MISC ChangeLog 11626 SHA256 964cacc50d875ff12c7844c7f93aef55e3e70d6000d5481e1d2cd624e0d0b961 SHA512 9ee845f66c489008b67390aa17abf103c50c6743b0eb54ab13bc1b05e8ea8b180e5dd2f88f8d409e4cc78ceedc9e38aeaf4b83996584a3553cd78db03a863abc WHIRLPOOL c46a20a196b6b5d6dbfc0439212f8e2b4331ad97ecaa59061dfe8747dca71471559946fe7348556f3be688f301a24a6ffb0d313d1f310190c34e497b8b4adbcf
-MISC metadata.xml 779 SHA256 45f0224012e2e5684097c3edcdeb84cc92421eb06b5baa73dc55932d73f28da1 SHA512 c37de2527ce33d71a4b1e6c4c45cd1d209e3ea529de1be4b9a13cd6f7bc39eeefcbbbd98381a6ddfbcb010fd402f4a4f6d6b7fda468df59a3091aaae706a120e WHIRLPOOL 3bca10e5dee46959103166b2565cf2f8aa4ba64d632cdf0b9c2da5b0d6f4898eda1a95ba2720cfabb4437256e43b3413543f3d4cc4269be679de2044a7c5a4d5
+EBUILD xcircuit-3.8.39.ebuild 1333 SHA256 062a919615edd50f313f76f07cbcf122d4550b9821052d03561eafdc9c625144 SHA512 af03d228f197cb0866e46eac5c375575fe02ca4d10c746d205ed8aa24af9550f3113e9781884a41e906f95ac2b9e083cc1bbf89884701fc531db38fe11d1c533 WHIRLPOOL d12ad777b4b55c225450df79e7a819bf2d8dabf1a706e7d5b411999c00e1d6e0e5576e185542bded5dcf5b5871496458459f0a4e9bec2ed206fcd49f24cb717a
+MISC ChangeLog 11875 SHA256 f1669b9a84867e879614c62b77a34d614492f4369a3794cb47af0d942e7d7098 SHA512 16232e394b134e108027097abce950639752a6ab7732616543975266ef25a55e320ca7af0c26c02937fddf3d9d5809562d4a52afc4fac2b45b645c25d7eb8a28 WHIRLPOOL 04b89f11d9c67bd789d54ed6e89d05d19b6400a0c2261ca902000f8ce90dd32b41274b225989eebab7681e265db72c2314540dd70743b057ef125d1f0aa36266
+MISC metadata.xml 1138 SHA256 767a351cfe702dfe1fb68f2700f9aa983ff1242cc6bbab8fd052509dd1030da5 SHA512 f81ecc4d05cd60e61f0acbf562f85d2fdec158aa53b4fd179baec6f0dd37ee2cb6e9e5084b93a6a20b5d0dadc3907f57c8f3d9cd91faf999c0574afb282d0675 WHIRLPOOL be577a0ea38821d2db0ef81e72987a520b9a99ffdffeef1cf5b3c34a738182142aa5d6acfb23837132745e99a5de317a1b22a5894ce00183aa31e387ae72d104
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRlNoDAAoJELp701BxlEWf2SIP/3jYVAAHr3v6eoo//Vt5ec62
-9s4NZdTGgBA1FxWl/294ktQ2Y3srlpfPlowHiHZfB9aKP36aCQP4otouA8Z1p6XD
-sdob+FP/kT6bYw3Wq15ZYKPqohWWKB0wOSGy82MqgIrt/1ZN7+21HieolLB+YLgi
-mUi0DkO3DWbkq23k5XwP0c2ktjmD9xA+hvtosj44nEJ54TF9ai6Pg4/oOYux1Q4d
-oOHU7wCYmegQYGWNo9bG328hI1shpU4/X3Lescnaz2SVgfgRzQMIANwUyuIYUM0I
-Xd/VfXbB3qqznwHyKQMy4R3NKjGaC+Hd+D99Ht6JiJIWkDRK6pnXNjX0KEgmZRRH
-7ZbN8UM01oMN4j2Fl14D2uIEu1E39Evzimq1H5IRCB4oGAwOoHxxmh/tOwG57+Er
-V2cIHD+WKNmHaM0RxeyD2ALpupjbmG+YeBFLGFkb7a7RaJ5J7RsJ30xLeWHLfKm3
-NBdU+LUICLkvnlqPuER2afcRgjKhJFcxFjapSE5g+f4YpXWpPbdpdP0ZWTgwTvyU
-EBeLFYIIfqTWvaQjQHnNzVlMfT46PU2lpvAiNk79QqXjggAXC7TDCdRaIk49gnH9
-LmKTvTlVq3G5BReBigYS/wrp2ckAFy9bS9F7QtPKe69Y1KrM5pPeccod1hPEFGBB
-0YqD0a333pftuMrd/q9y
-=SP0Z
+iF4EAREIAAYFAlGfB3oACgkQknrdDGLu8JDDiQD6A8wniD8QtcoWI8r0TKMQmR34
+JdSz+Q+HbrOws3No3zUA/iVO58wlEZmI9WNl8/TeqERVq334yudef3c6q0WzZ+x9
+=EZLQ
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/xcircuit/metadata.xml b/sci-electronics/xcircuit/metadata.xml
index feb3585e3d7a..540de648ae51 100644
--- a/sci-electronics/xcircuit/metadata.xml
+++ b/sci-electronics/xcircuit/metadata.xml
@@ -12,4 +12,13 @@
   circuit drawing; it maintains flexiblity in style without compromising the
   power of schematic capture.
   </longdescription>
+<upstream>
+    <maintainer status="active">
+    <email>tim@opencircuitdesign.com</email>
+	<name>Timothy Edwards</name>
+    </maintainer>
+    <changelog>http://www.opencircuitdesign.com/xcircuit/changes.html</changelog>
+    <doc lang="en">http://www.opencircuitdesign.com/xcircuit/reference.html</doc>
+	<bugs-to>tim@opencircuitdesign.com</bugs-to>
+</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/xcircuit/xcircuit-3.7.39.ebuild b/sci-electronics/xcircuit/xcircuit-3.7.39.ebuild
deleted file mode 100644
index bd8b11f846d2..000000000000
--- a/sci-electronics/xcircuit/xcircuit-3.7.39.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.39.ebuild,v 1.4 2012/06/19 01:34:43 xmw Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-DESCRIPTION="Circuit drawing and schematic capture program."
-SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
-HOMEPAGE="http://opencircuitdesign.com/xcircuit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="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"
-RDEPEND=${DEPEND}
-
-RESTRICT="test" #131024
-
-src_prepare() {
-	eautoreconf		# avoid QA-warning wrt automaintainer mode
-}
-
-src_configure() {
-	export loader_run_path="/usr/$(get_libdir)"
-	econf \
-		--disable-dependency-tracking \
-		--with-tcl \
-		--with-ngspice
-}
-
-src_compile() {
-	emake appdefaultsdir="/usr/share/X11/app-defaults" || die
-}
-
-src_install () {
-	emake DESTDIR="${D}" appdefaultsdir="/usr/share/X11/app-defaults" \
-		appmandir="/usr/share/man/man1" install || die
-	dodoc CHANGES README* TODO
-}
diff --git a/sci-electronics/xcircuit/xcircuit-3.7.49.ebuild b/sci-electronics/xcircuit/xcircuit-3.7.49.ebuild
new file mode 100644
index 000000000000..58cdb27980a9
--- /dev/null
+++ b/sci-electronics/xcircuit/xcircuit-3.7.49.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.7.49.ebuild,v 1.1 2013/05/24 06:23:57 xmw Exp $
+
+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"
+HOMEPAGE="http://opencircuitdesign.com/xcircuit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+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"
+RDEPEND=${DEPEND}
+
+RESTRICT="test" #131024
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	# 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)"
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--with-tcl
+		--with-ngspice
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
+}
+
+src_install () {
+	autotools-utils_src_install \
+		appdefaultsdir="/usr/share/X11/app-defaults" \
+		appmandir="/usr/share/man/man1"
+}
diff --git a/sci-electronics/xcircuit/xcircuit-3.8.39.ebuild b/sci-electronics/xcircuit/xcircuit-3.8.39.ebuild
new file mode 100644
index 000000000000..d0ea94bc2748
--- /dev/null
+++ b/sci-electronics/xcircuit/xcircuit-3.8.39.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.8.39.ebuild,v 1.1 2013/05/24 06:23:57 xmw Exp $
+
+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"
+HOMEPAGE="http://opencircuitdesign.com/xcircuit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+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"
+RDEPEND=${DEPEND}
+
+RESTRICT="test" #131024
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	# 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)"
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--with-tcl
+		--with-ngspice
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
+}
+
+src_install () {
+	autotools-utils_src_install \
+		appdefaultsdir="/usr/share/X11/app-defaults" \
+		appmandir="/usr/share/man/man1"
+}