Version bump (bug #481732). Thanks alexrenzi for reporting

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

4 files changed, 117 insertions, 11 deletions

diff --git a/sci-electronics/systemc/ChangeLog b/sci-electronics/systemc/ChangeLog
index b3f4980c75f7..98286afcd600 100644
--- a/sci-electronics/systemc/ChangeLog
+++ b/sci-electronics/systemc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/systemc
-# 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 $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/systemc/ChangeLog,v 1.16 2013/09/15 14:40:07 tomjbe Exp $
+
+*systemc-2.3.0 (15 Sep 2013)
+
+  15 Sep 2013; Thomas Beierlein <tomjbe@gentoo.org> +systemc-2.3.0.ebuild,
+  +files/systemc-2.3.0-config.patch:
+  Version bump (bug #481732). Thanks alexrenzi for reporting
 
 *systemc-2.2.0-r2 (26 Apr 2012)
 
diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index a0d329e33579..f02ff91eeccb 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST systemc-2.2.0.tgz 2050634 RMD160 7c5b3e45f3fecd4027b0b49cb9b90014a1f0c996 SHA1 a914b335a4f46f7c687f4f315bb931da1e626d4f SHA256 fd7db3ac2b547bf54c94c0310f15f079ed59ffa318ed5b0043a65410960859e7
-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
+AUX systemc-2.3.0-config.patch 724 SHA256 0b8b207d42211138c5eb9fb14c33220b5b6d58ab1df022141e11249e0f0837cc SHA512 aabe12c73103dd6393b00aed01b70a0d0c124fb0c521cce56f1412157085c07274f1fa41d27e15bfe5b1744342368d46b9290c4f40520b437714f09491cf26ec WHIRLPOOL 017b23d5ac172b3b8306b61ad973470f6c2644cd8d06d285661472435246dbd6d8ec87fbfd39d39706a6250a5c7e60e1d474744350e24538f5ad4e398c1270de
+DIST systemc-2.2.0.tgz 2050634 SHA256 fd7db3ac2b547bf54c94c0310f15f079ed59ffa318ed5b0043a65410960859e7 SHA512 221e411d8037bd75ce4c5ced858351dd7e24554cdf541ece35f087fae7c9905315be4ebde5210f365dba9594167affe37f267ccf10b01ddb82fa5c980b2affc7 WHIRLPOOL 85cce5a92f7c912a11bb7bdd5817f410b2ed11d85ff9d6d8c82ba42fc436bc2ad2802d7cabc2f0b8dd05800f69cc92fdd7166afbd7329cfccc709fcff3cecc02
+DIST systemc-2.3.0.tgz 7209233 SHA256 20e52b1f42ea18dd0dbeab354161fb70a7dac87c294e00499f63514a12ab8b2a SHA512 38a349fd16a76cc7b27f54d096482ed7d253b25d25c5304806f7cc72b1bc8f32f8fd627ab023b23f8491023913a3172c11351fe5b2c8b7b9d80fb60fe687ab22 WHIRLPOOL 87c130a563fec5e36f208776e4b005851562aec73cf859c9151fdae6f1f16dca51cbdc359f6268b2a25fa7e48e2a9bdbd58b4d2e6107cc22e60fa23cac43810b
+EBUILD systemc-2.2.0-r2.ebuild 1850 SHA256 6f6454af1b18ca34603a8f29125c75de94518022276aad65278592db65f106d4 SHA512 7266e2b0e70edcf2a2e6d71c53273e6eb301efc71478a02f901ec014124dad914d86c598b38111d6790c26516790a2437c9ed1c52ffde65721cb5a4e80c9266c WHIRLPOOL ebc455f70f804ddbb8a05bd95cf9ae6be2c4c6007415db0cc1702a5302ce4fa27b47c27cb0634b8f7621de29583aaa20589cd09dadf8151f45cd2f244a344b6f
+EBUILD systemc-2.3.0.ebuild 2123 SHA256 b8e075f2bea310f31e78a18556c6aea9a93df72cb655943717a9cfb8afb92abc SHA512 b8c5f111ab45c75523d469634c341a6fed0cc81d0d9be8fb8feaf01ecb19f5d870be05d183da422bd5cdea1870268b5ed253af77f24fdcae590a8bbf6db103a9 WHIRLPOOL 5da07cbc27aee576618d8e18f2bc50e95656ab5a8b2e4458189945b0a4384a0eb5703aa9bf65f1cb46ae62a226574385fa8e09f7880707e55a2182cd3feb4e57
+MISC ChangeLog 3155 SHA256 864d236b0a6b142daa6c661c67c315f36ea6e5958b39ea5063b6c756fb084976 SHA512 7bfddf812c24a3d706c41a8feb292dfbbe0c968aafd8891cd44feb739afc1848f716a2781da61fbda57adab08710b39386be6e667b9b9b9b1b71070d39207575 WHIRLPOOL 4e8f5d3d00eb095a962a1f2676ce5cd5d61d3fe687c5596a01dd39ef7bced818c859a5384713d59de6f302bd2231466f299ec77f1d4747f8dfe191b6abb55cb2
+MISC metadata.xml 644 SHA256 9a0d93cb1119e0498d6af66593e74114ea493adfe0ed648658f54e1008ed5621 SHA512 f5c33c34e47b3801d66f102604b2335f3e002070deae3410aa96eaa3516db9d57b5564e5fae65f31fc6553d8c4b710d4c81217cc91e2a0eda124facb8bf2a071 WHIRLPOOL 708659bc686d4085540a8c5bbcc12b48d8db7bc8f094b977cbaef6da5c961457230b0ad799b6151d5e8b7a192e70b9bfd7672ba4356c84e95e234c8831168b27
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAk+ZbGoACgkQgAnW8HDreRaVcwCfVpLQOMxUSOGTL3SWgIn02RdP
-G40An2n8JwezmDERNWUnoY5Qof/ZfeLf
-=PpRj
+iEYEAREIAAYFAlI1xs8ACgkQQe4uqXYgU9VZnACfW6tABTzUEGJJohnQ44fdgsoJ
+x3kAn2Bl3JhmtegCgA+YY4CNLE23Dsu1
+=loRu
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/systemc/files/systemc-2.3.0-config.patch b/sci-electronics/systemc/files/systemc-2.3.0-config.patch
new file mode 100644
index 000000000000..581e625c6113
--- /dev/null
+++ b/sci-electronics/systemc/files/systemc-2.3.0-config.patch
@@ -0,0 +1,21 @@
+# drop compiler check to enable use of CXX
+--- configure.in.old	2013-09-15 09:38:54.000000000 +0200
++++ configure.in	2013-09-15 09:40:31.000000000 +0200
+@@ -134,15 +134,8 @@
+                 AC_MSG_ERROR("sorry...architecture not supported")
+             ;;
+         esac
+-        case "$CXX_COMP" in
+-            c++ | g++)
+-                EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} -m${CPU_ARCH}"
+-                EXTRA_ASFLAGS="-m${CPU_ARCH}"
+-                ;;
+-            *)
+-                AC_MSG_ERROR("sorry...compiler not supported")
+-            ;;
+-        esac
++        EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} -m${CPU_ARCH}"
++        EXTRA_ASFLAGS="-m${CPU_ARCH}"
+         ;;
+     *freebsd*)
+         case "$target_cpu" in
diff --git a/sci-electronics/systemc/systemc-2.3.0.ebuild b/sci-electronics/systemc/systemc-2.3.0.ebuild
new file mode 100644
index 000000000000..c4d1572f16bd
--- /dev/null
+++ b/sci-electronics/systemc/systemc-2.3.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/systemc/systemc-2.3.0.ebuild,v 1.1 2013/09/15 14:40:07 tomjbe Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs autotools-utils
+
+DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
+HOMEPAGE="http://www.systemc.org/"
+SRC_URI="${P}.tgz"
+
+SLOT="0"
+LICENSE="SOPLA-3.0"
+IUSE="doc static-libs"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="fetch test"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+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_prepare() {
+	# drop compiler check to enable use of CXX
+	epatch "${FILESDIR}"/${P}-config.patch
+
+	sed -i -e "s:OPT_CXXFLAGS=\"-O3\":OPT_CXXFLAGS=\"\":g" configure.in || die "Patching configure.in failed"
+
+	sed -i -e "s:lib-\$(TARGET_ARCH):$(get_libdir):g" $(find . -name Makefile.am) || die "Patching Makefile.am failed"
+
+	# respect DESTDIR
+	sed -i -e "s:\$(prefix):\$(DESTDIR)\$(prefix):g" $(find . -name Makefile.am) || die "Patching Makefile.am failed"
+
+	eautoreconf
+
+	sed -i -e "s:\$(DESTDIR)\$(libdir):\$(libdir):g" src/sysc/Makefile.in || die
+
+	for sfile in src/sysc/qt/md/*.s ; do
+		sed -i -e '$a \
+#if defined(__linux__) && defined(__ELF__) \
+.section .note.GNU-stack,"",%progbits \
+#endif' "${sfile}" || die "Patching ${sfile} failed"
+	done
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) CXX=$(tc-getCXX)
+}
+
+src_compile() {
+	cd src
+	default
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog INSTALL NEWS README RELEASENOTES
+	rm docs/License.pdf || die
+	use doc && dodoc -r docs/*
+	cd src
+	autotools-utils_src_install
+}
+
+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"
+}