sci-electronics/systemc: Drop old, move to EAPI=4

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

6 files changed, 47 insertions, 88 deletions

diff --git a/sci-electronics/gnetman/Manifest b/sci-electronics/gnetman/Manifest
index 9a5792429b76..329e5a2b2905 100644
--- a/sci-electronics/gnetman/Manifest
+++ b/sci-electronics/gnetman/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST gnetman-22Dec04.tar.gz 725945 RMD160 6437acd3b9bebb2f6b8398a6157c838fcf2922e3 SHA1 bd3187ff1381feccee804c5f1df0a10c081989d6 SHA256 81f2938a7ff1c4c619ea313c3209c6759df30cfeff8afec31a2d12344af54b90
 DIST gnetman-22May06.tar.gz 758274 RMD160 2f1dcd2ac32cd1cbd9ff73c73babcfbe46f17e19 SHA1 2f79e2cdf1dc459fa8289a2328d0e1541819c730 SHA256 53ffbc1fb2479a5a0a205b2b330502a44474f7b9c993a43ca07c5e848ca8af82
-EBUILD gnetman-0.0.1_pre20041222.ebuild 686 RMD160 bea49fb9af6214d9a2d8c9d69ceaa406a08b7fb2 SHA1 5407ab6cc39b49b038fad319cb47b6f1e72e9cc8 SHA256 f6f180aed776643ba0360bcfa672b37bc8a415eaceb55a1dc43433482eee6c43
-EBUILD gnetman-0.0.1_pre20060522-r2.ebuild 1108 RMD160 aa903feac2d4c4e5802f675f8e02d3ea23bce2ad SHA1 9bf469d65ee06fac475094d123cde47985c6c718 SHA256 ee3501c966a271092918b6bbce1eaa016215d4712e7df7eefc49389de1c9e031
-EBUILD gnetman-0.0.1_pre20060522.ebuild 753 RMD160 dccd5b36ba47928c37f58756f40051ffd96d36de SHA1 6df49210500f96bed4eaa83d8b5220531d229fd8 SHA256 5cf8b0c6516364e823e1482e92329d6d496b096f227805f4efa52fc0756618da
-MISC ChangeLog 1733 RMD160 fbf7ca226742e034e0691d2596ac07d2de6b297d SHA1 15d1a1b6992439d7b18e87160a74f809443c90da SHA256 7da87f09c34802393262ada185716e3a3e5af4498f384dae739ff0fc61be98d0
-MISC metadata.xml 495 RMD160 50f9bdcd1c3442aa0b99f1ec3bff33ff859922cb SHA1 254e770f63c74bdbc5ae27a6fb499d161032c1a0 SHA256 36aa6f1d9d7c8b14d681169220569ba299dcb55fe2030b10a9b25475ff957e42
+EBUILD gnetman-0.0.1_pre20041222.ebuild 550 RMD160 5c14279faf7975f0e0ce4d83b6fe51cd44b253e6 SHA1 4ab684fb9eac3dc1db1a16aeab57cd2c846f39de SHA256 71884a47a2a355ade8a704339038448be78e323a5a1988425bf3384c94940fc4
+EBUILD gnetman-0.0.1_pre20060522-r2.ebuild 1013 RMD160 5defab024711a2728081e20148edfd1ecaff8ec6 SHA1 bc77664468ecb95a9b8d2af59eb9f58ae4c7f8ad SHA256 93b0d45ea8c210a804ca86b6c4867c97a56a2831f3e24e6ec49370fdfbdc82fa
+MISC ChangeLog 1917 RMD160 07bbf12590d4bf8b0341f0ae33a0fa2888fabc8b SHA1 7c8e3817aa6e6e294ef1daf3357266b610e4c578 SHA256 69c2598ac6f2e2d64e61f119859af8c07b1d4ee19c9bcce09e7f6ca9181e35e8
+MISC metadata.xml 493 RMD160 ef1bf1776adf6ebfaa904056bf3473709c010d88 SHA1 3fbecabf83a0ba2f6bbdd55fc21f4d52b852f5c8 SHA256 ba746107fd9b758e214a13c105b9d6c4a6bf9dcc3c90d560e7ebe1ad90060e88
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkwhErsACgkQHB6c3gNBRYcZFQCgjEBhHmaQKQ/uCo7qD26J041T
-xJ8An2+fproOmydjKdXfSVqJjuIJ87V5
-=Y6l9
+iEYEAREKAAYFAk+ZbUEACgkQgAnW8HDreRZriwCgt3zcVR6ky5CAbanmdWWsYK3b
+VycAn28SJkNi+wwXWRRDg4joSQEnDWPA
+=n03X
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/systemc/ChangeLog b/sci-electronics/systemc/ChangeLog
index f3ad2bae48be..b3f4980c75f7 100644
--- a/sci-electronics/systemc/ChangeLog
+++ b/sci-electronics/systemc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/systemc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/systemc/ChangeLog,v 1.14 2009/07/11 17:59:04 calchan Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/systemc/ChangeLog,v 1.15 2012/04/26 15:40:20 jlec Exp $
+
+*systemc-2.2.0-r2 (26 Apr 2012)
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> -systemc-2.2.0.ebuild,
+  -systemc-2.2.0-r1.ebuild, +systemc-2.2.0-r2.ebuild, metadata.xml:
+  Drop old, move to EAPI=4
 
 *systemc-2.2.0-r1 (11 Jul 2009)
 
diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index 69e240d51ee5..a0d329e33579 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,5 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST systemc-2.2.0.tgz 2050634 RMD160 7c5b3e45f3fecd4027b0b49cb9b90014a1f0c996 SHA1 a914b335a4f46f7c687f4f315bb931da1e626d4f SHA256 fd7db3ac2b547bf54c94c0310f15f079ed59ffa318ed5b0043a65410960859e7
-EBUILD systemc-2.2.0-r1.ebuild 1937 RMD160 c05f81f5b1318ce25a444b6d9d746ba396944d7b SHA1 da6ce26456ec157f9a3babb75e7e0d7dadc33f5e SHA256 433dfc5dcb0ad52d11d7bee78026d7aa2dc07244bbf4720ffb8bbe2b3eb1eb09
-EBUILD systemc-2.2.0.ebuild 1544 RMD160 16a727c86bcff122103ef44fc3e9b1738073ce2a SHA1 f84624936ee8bb7f423890958853b55599c90cfc SHA256 2c3b1b417aa1a61d60a8082286b5ed202219470968394031932dc0ea389c0de2
-MISC ChangeLog 2753 RMD160 14dc03e6916b98e70b5f394604ac384fb534cc51 SHA1 85942a88734b298990ca7afd6793371545a3e391 SHA256 39466fe0ba22fbf8e84a62743535b1e3865bf48902f324f41601dcd3bb730ed4
-MISC metadata.xml 646 RMD160 60e2ec4364294f0be9419c30413ec93ee8bd96fd SHA1 01247171085cb65ed9c2f210969763228ee316c6 SHA256 c96bd5be1afd449e04d51d43e09dbadf97e5b7d3c8eebf8f05a1b271cd4b3419
+EBUILD systemc-2.2.0-r2.ebuild 1850 RMD160 fb4d7c773db851406d66ba4611a2e53768e9b2e6 SHA1 a8f184ff8de43369fbea943485395174480543fe SHA256 6f6454af1b18ca34603a8f29125c75de94518022276aad65278592db65f106d4
+MISC ChangeLog 2949 RMD160 bcb5d268815b515af7dfcdb3d5c20f60196326f2 SHA1 b2c51350defd4642b3b18b989deaab179c04f958 SHA256 1f6a5c6eb3396b481a22c3e2d53041f017d7de84c40d3424353cab4e8f594a4d
+MISC metadata.xml 644 RMD160 1514a571f8ad4a133deb68f7eeb8bc831bd3f7ce SHA1 1e817bd74bd46d1d98c66af97ea5f19b39772233 SHA256 9a0d93cb1119e0498d6af66593e74114ea493adfe0ed648658f54e1008ed5621
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAk+ZbGoACgkQgAnW8HDreRaVcwCfVpLQOMxUSOGTL3SWgIn02RdP
+G40An2n8JwezmDERNWUnoY5Qof/ZfeLf
+=PpRj
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/systemc/metadata.xml b/sci-electronics/systemc/metadata.xml
index 103709ea59d9..b2e59d373fab 100644
--- a/sci-electronics/systemc/metadata.xml
+++ b/sci-electronics/systemc/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>
   SystemC provides hardware-oriented constructs within the context of C++
   as a class library implemented in standard C++. Its use spans design and
   verification from concept to implementation in hardware and software.
diff --git a/sci-electronics/systemc/systemc-2.2.0-r1.ebuild b/sci-electronics/systemc/systemc-2.2.0-r2.ebuild
index a969548ae13b..0049555e981c 100644
--- a/sci-electronics/systemc/systemc-2.2.0-r1.ebuild
+++ b/sci-electronics/systemc/systemc-2.2.0-r2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/systemc/systemc-2.2.0-r1.ebuild,v 1.1 2009/07/11 17:59:04 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/systemc/systemc-2.2.0-r2.ebuild,v 1.1 2012/04/26 15:40:20 jlec Exp $
 
-inherit versionator multilib
+EAPI=4
+
+inherit versionator multilib toolchain-funcs
 
 DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
-LICENSE="SOPLA-2.3"
 HOMEPAGE="http://www.systemc.org/"
 SRC_URI="${P}.tgz"
 
 SLOT="0"
+LICENSE="SOPLA-2.3"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch test"
 
-DEPEND=""
-RDEPEND=""
+RESTRICT="fetch test"
 
 pkg_nofetch() {
 	elog "${PN} developers require end-users to accept their license agreement"
@@ -23,10 +23,7 @@ pkg_nofetch() {
 	elog "Please download ${A} manually and place it in ${DISTDIR}."
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i -e "s:lib-\$(TARGET_ARCH):$(get_libdir):g" $(find . -name Makefile.in) || die "Patching Makefile.in failed"
 
 	sed -i -e "s:OPT_CXXFLAGS=\"-O3\":OPT_CXXFLAGS=\"${CXXFLAGS}\":g" configure || die "Patching configure failed"
@@ -43,18 +40,20 @@ src_unpack() {
 	done
 }
 
+src_configure() {
+	econf --disable-dependency-tracking CXX=$(tc-getCXX)
+}
+
 src_compile() {
-	econf --disable-dependency-tracking CXX="g++" || die "Configuration failed"
 	cd src
-	emake || die "Compilation failed"
+	default
 }
 
 src_install() {
 	dodoc AUTHORS ChangeLog INSTALL NEWS README RELEASENOTES
-	insinto /usr/share/doc/${PF}/docs
-	doins docs/*
+	doins -r docs
 	cd src
-	einstall
+	default
 }
 
 pkg_postinst() {
diff --git a/sci-electronics/systemc/systemc-2.2.0.ebuild b/sci-electronics/systemc/systemc-2.2.0.ebuild
deleted file mode 100644
index eea0a10ef595..000000000000
--- a/sci-electronics/systemc/systemc-2.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/systemc/systemc-2.2.0.ebuild,v 1.1 2007/04/22 15:38:02 calchan Exp $
-
-inherit versionator multilib
-
-DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
-LICENSE="SOPLA-2.3"
-HOMEPAGE="http://www.systemc.org/"
-SRC_URI="${P}.tgz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch test"
-
-DEPEND=""
-
-pkg_nofetch() {
-	elog "${PN} developers require end-users to accept their license agreement"
-	elog "by registering on their Web site (${HOMEPAGE})."
-	elog "Please download ${A} manually and place it in ${DISTDIR}."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:lib-\$(TARGET_ARCH):$(get_libdir):g" $(find . -name Makefile.in) || die "Patching failed"
-	sed -i -e "s:OPT_CXXFLAGS=\"-O3\":OPT_CXXFLAGS=\"${CXXFLAGS}\":g" configure || die "Patching failed"
-}
-
-src_compile() {
-	econf --disable-dependency-tracking CXX="g++" || die "Configuration failed"
-	cd src
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog INSTALL NEWS README RELEASENOTES
-	insinto /usr/share/doc/${PF}/docs
-	doins doc/*
-	cd src
-	einstall
-}
-
-pkg_postinst() {
-	elog "If you want to run the examples, you need to :"
-	elog "    tar xvfz ${PORTAGE_ACTUAL_DISTDIR}/${A}"
-	elog "    cd ${P}"
-	elog "    find examples -name 'Makefile.*' -exec sed -i -e 's/-lm/-lm -lpthread/' '{}' \;"
-	elog "    ./configure"
-	elog "    cd examples"
-	elog "    make check"
-}