commit:     c9c800065e2460aea40e93eec05ebfcd35af68cd
Author:     Masanori Ogino <masanori.ogino <AT> gmail <DOT> com>
AuthorDate: Thu Jun  1 07:48:50 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 08:41:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c80006

sci-electronics/systemc-2.3*: Adopt to re-license.

Bug: https://bugs.gentoo.org/600302
Closes: https://github.com/gentoo/gentoo/pull/4820
Signed-off-by: Masanori Ogino <masanori.ogino <AT> gmail.com>

 sci-electronics/systemc/Manifest                         |  4 ++--
 .../{systemc-2.3.0.ebuild => systemc-2.3.0-r1.ebuild}    | 16 +++++++++-------
 .../{systemc-2.3.1.ebuild => systemc-2.3.1-r1.ebuild}    | 16 +++++++++-------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index fecaf6143f9..66a118fbe3d 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,3 +1,3 @@
 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
-DIST systemc-2.3.1.tgz 7291190 SHA256 
7ce0f68fd4759e746a9808936b54e62d498f5b583e83fc47758ca86917b4f800 SHA512 
e150f90ceb2fcab099956afb6a119a47d7dcac82ba100bb52734b12acff47fdb1210168cfb97d89701a40c561befb5ea9bec23bc9e66a3bd908409c14092776e
 WHIRLPOOL 
992d29e6a4adc2da3c1e5ea5421c85b22c99b857a3640154f02622d9d6260db4c02846aa4326aa5bce1c165d01a40fc0963fb38273cab3a4b9cd3d2877ea0aaa
+DIST systemc-2.3.0a.tar.gz 7084178 SHA256 
b9da6e78e960543eb531b7bfaf65809320f53832744ee22af4431300e81bf8c5 SHA512 
3af3c0c96a95ee75e0a6c046fdd94ee822b8fbbc1c79e7bbf9b905e7a2d3689282e6d97cfa56c93094155d79126e74f052c0f0e12f31bf4321b28a03aae347ab
 WHIRLPOOL 
b5b3fe7ab3dcf523e5b26177a787649b2793002544cf35c97aec34d1fcc9e5481f47ec8c031cb1a7ad4390876c549e2145283a31551129bde2aecb9a66209fee
+DIST systemc-2.3.1a.tar.gz 7050669 SHA256 
3e9d0afb5b76f5435305c2f0481b203041373d4a24776c301204c87b3e0f5c81 SHA512 
cd52eb6e413c8b852e19c8387766eacbddf85e9b2f4d137f3d82d0d4025f13a44216a2e6cacf7b9e2b972584912a4a1c75cdb37a568330ce66a6bf909ca1b723
 WHIRLPOOL 
678b655dcf63c0d201a7be3827775baa4a79761411a5643a4132842e576fc92502b166ff876c97a546c2ed78503b2ecb4fc2319b8b651dfcc3437dd9baae26f8

diff --git a/sci-electronics/systemc/systemc-2.3.0.ebuild 
b/sci-electronics/systemc/systemc-2.3.0-r1.ebuild
similarity index 87%
rename from sci-electronics/systemc/systemc-2.3.0.ebuild
rename to sci-electronics/systemc/systemc-2.3.0-r1.ebuild
index 1adf1851f86..d34a8361dac 100644
--- a/sci-electronics/systemc/systemc-2.3.0.ebuild
+++ b/sci-electronics/systemc/systemc-2.3.0-r1.ebuild
@@ -1,23 +1,26 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
 inherit eutils multilib toolchain-funcs autotools-utils
+MY_P="${P}a"
 
 DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
-HOMEPAGE="http://www.systemc.org/";
-SRC_URI="${P}.tgz"
+HOMEPAGE="http://accellera.org/community/systemc";
+SRC_URI="http://accellera.org/images/downloads/standards/${PN}/${MY_P}.tar.gz";
 
 SLOT="0"
-LICENSE="SOPLA-3.0"
+LICENSE="Apache-2.0"
 IUSE="doc static-libs"
 KEYWORDS="~amd64 ~x86"
 
-RESTRICT="fetch test"
+RESTRICT="test"
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_nofetch() {
        elog "${PN} developers require end-users to accept their license 
agreement"
        elog "by registering on their Web site (${HOMEPAGE})."
@@ -58,7 +61,6 @@ src_compile() {
 
 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
@@ -67,7 +69,7 @@ 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 "    cd ${MY_P}"
        elog "    find examples -name 'Makefile.*' -exec sed -i -e 's/-lm/-lm 
-lpthread/' '{}' \;"
        elog "    ./configure"
        elog "    cd examples"

diff --git a/sci-electronics/systemc/systemc-2.3.1.ebuild 
b/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
similarity index 82%
rename from sci-electronics/systemc/systemc-2.3.1.ebuild
rename to sci-electronics/systemc/systemc-2.3.1-r1.ebuild
index 2ac64a393f3..528688c0d2a 100644
--- a/sci-electronics/systemc/systemc-2.3.1.ebuild
+++ b/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
@@ -1,23 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # 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="http://www.systemc.org/";
-SRC_URI="${P}.tgz"
+HOMEPAGE="http://accellera.org/community/systemc";
+SRC_URI="http://accellera.org/images/downloads/standards/${PN}/${MY_P}.tar.gz";
 
 SLOT="0"
-LICENSE="SOPLA-3.0"
+LICENSE="Apache-2.0"
 IUSE="doc static-libs"
 KEYWORDS="~amd64 ~x86"
 
-RESTRICT="fetch test"
+RESTRICT="test"
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_nofetch() {
        elog "${PN} developers require end-users to accept their license 
agreement"
        elog "by registering on their Web site (${HOMEPAGE})."
@@ -40,7 +43,6 @@ src_configure() {
 
 src_install() {
        dodoc AUTHORS ChangeLog INSTALL NEWS README RELEASENOTES
-       rm docs/SystemC_Open_Source_License.pdf || die
        rm docs/Makefile* || die
        use doc && dodoc -r docs/*
        cd src
@@ -50,7 +52,7 @@ 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 "    cd ${MY_P}"
        elog "    find examples -name 'Makefile.*' -exec sed -i -e 's/-lm/-lm 
-lpthread/' '{}' \;"
        elog "    ./configure"
        elog "    cd examples"

Reply via email to