upstream maintainer, version bumps, drop old.

(Portage version: 2.2.0_alpha175/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 143 insertions, 51 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/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"
+}