gentoo resync : 22.01.2021

4 files changed, 69 insertions, 58 deletions

diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index 73915e4fd745..89b92f866d72 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,3 +1,3 @@
-DIST systemc-2.3.1a.tar.gz 7050669 BLAKE2B eb080ba177ada7fcd816134e62e6461da59a186cd5d1a14627d69d425f72becd587ef7d31e9e48af76cf54f92ccf83f38a079e5598b4fe2e6b349dc4ec74f640 SHA512 cd52eb6e413c8b852e19c8387766eacbddf85e9b2f4d137f3d82d0d4025f13a44216a2e6cacf7b9e2b972584912a4a1c75cdb37a568330ce66a6bf909ca1b723
-EBUILD systemc-2.3.1-r1.ebuild 1331 BLAKE2B a728bdd43f709bea98919ec750c79e908ce399d0469f99b4279cd227565db0847c7156a71177cd8a8677150231c16ce775a73dcfc30b12a56317c065b392b3c0 SHA512 8510e33478f9705c8ef435a4a19d1d8dde901f461d0f049109c4d1041ba33220321e4e733f75eb58f770298adc5e499f59c756e8f71587e55b5636bbafa1a949
-MISC metadata.xml 742 BLAKE2B 498b0bb60374137fcefdf08bb2c751d20fa7795777627a8b30bb7c4039274dc0d6f3bf88decb8ee49aa26fae32a53f4219c8ef73faedc2cde825961fe8999fa5 SHA512 a3d752c7f86e8d03dd62e0dd9c0e35ea38b654fa36db05925b7339d3a34e4bd97216948f10202f4a8efd7ef8ab15cc91d1437179b592816bd8bae63d3f5dffa3
+DIST systemc-2.3.4.tar.gz 7142529 BLAKE2B 8a7e7e9f49b0131c1536d217dcc4fc420bc72ed962736a457cdaf3e40390be2a5051010317a62ba1eca17ee7ee4a171950979d2f07cb7fecc7286d028675540f SHA512 77fd1810fafeaa639cb21fcd77c7132c0ba3cf42309d3e09953c62c92f83b18e6de2e26620cee267683ca851503e5a8419523e7c9161f2ae33aea372af0be966
+EBUILD systemc-2.3.4-r1.ebuild 1181 BLAKE2B 395047e7162753a958966f03e1d88d2e29f7aa6748e2e090c4b728181405fb9fe799e53d427cbe106953a2453ca7a2a16e83d969dca49356ea443d9542a2db0c SHA512 e94076b3df3fabf18c270ea8d5a8af2d62c1e2d04f63a83e9b60e060b0dc01e1323b79602731e6661e746e420ad2e7572a9bf0ed751982ce13541a58ff2589b5
+MISC metadata.xml 1063 BLAKE2B ddb2f5ae50f1be2e884bf275dae129234bee070a9d6a7bd9dc4647fbb3e40be7f83ac26098001169b42c95582a8fca7a7d1a3e510cea829c9dbbfe669455eeb4 SHA512 04211a6b31f25e0a985e4d98af36522dfe75c8836a48d0bf8b0c64ff146bb4f13fc1118693b6a8c647c7b58eefa319046caa1580beb46ffabd0559bd83efd715
diff --git a/sci-electronics/systemc/metadata.xml b/sci-electronics/systemc/metadata.xml
index 69bab89b6add..dfe18456e677 100644
--- a/sci-electronics/systemc/metadata.xml
+++ b/sci-electronics/systemc/metadata.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sci-electronics@gentoo.org</email>
 		<name>Gentoo Electronics Project</name>
 	</maintainer>
-	<longdescription>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">accellera-official/systemc</remote-id>
+	</upstream>
+	<longdescription lang="en">
 		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.3.1-r1.ebuild b/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
deleted file mode 100644
index 118bb843f610..000000000000
--- a/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs autotools-utils
-MY_P="${P}a"
-
-DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
-HOMEPAGE="https://accellera.org/community/systemc"
-SRC_URI="https://accellera.org/images/downloads/standards/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc static-libs"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="test"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	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)\
-	--with-unix-layout
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog INSTALL NEWS README RELEASENOTES
-	rm docs/Makefile* || 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 ${MY_P}"
-	elog "    find examples -name 'Makefile.*' -exec sed -i -e 's/-lm/-lm -lpthread/' '{}' \;"
-	elog "    ./configure"
-	elog "    cd examples"
-	elog "    make check"
-}
diff --git a/sci-electronics/systemc/systemc-2.3.4-r1.ebuild b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..4669cd8f6d9b
--- /dev/null
+++ b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV}_pub_rev_20190614"
+
+inherit autotools
+
+DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
+HOMEPAGE="
+	https://accellera.org/community/systemc
+	https://github.com/accellera-official/systemc
+"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/accellera-official/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/accellera-official/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug doc examples static-libs test"
+REQUIRED_USE="examples? ( doc )"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+	eautoconf --force
+}
+
+src_configure() {
+	econf CXX=$(tc-getCXX) \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		--with-unix-layout
+}
+
+src_install() {
+	default
+	if use doc; then
+		if use examples; then
+			docompress -x /usr/share/doc/"${PF}"/examples
+		else
+			rm -r "${ED}"/usr/share/doc/"${PF}"/examples || die
+		fi
+	else
+		rm -r "${ED}"/usr/share/doc/"${PF}" || die
+	fi
+}