[gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/

[Sergei Trofimovich]

commit:     78452f111aa5b4903378d311d9b43090196d789a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 00:07:31 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 00:07:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78452f11

dev-embedded/sdcc: bump up to 4.0.0, bug #697746

Reported-by: Esteve Varela Colominas
Closes: https://bugs.gentoo.org/697746
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-embedded/sdcc/Manifest                         |  2 +
 dev-embedded/sdcc/metadata.xml                     | 35 +++++++++------
 .../sdcc/{sdcc-9999.ebuild => sdcc-4.0.0.ebuild}   | 51 +++++++++++++++-------
 dev-embedded/sdcc/sdcc-9999.ebuild                 | 51 +++++++++++++++-------
 4 files changed, 93 insertions(+), 46 deletions(-)

diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 9e9fbf6092d..ea672c78bce 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,2 +1,4 @@
 DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
+DIST sdcc-doc-4.0.0.tar.bz2 980999 BLAKE2B 6f9478c095e6b4fec27c6ab7a10a8564ae46d754709848b3a7a26a7a2dfecd3833ce3cfe7a41f9033b5a34a1b6e962090d91c9688294dd347e1c98658761c019 SHA512 83bed77b46ad2f028725a3ffe6090d71185f73d4e99c241e7ebd1c509ba1be1911f4b9130c344fa4eb928f48122179b6b71e9d5a27d9f18ff74017c61fae77ff
 DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
+DIST sdcc-src-4.0.0.tar.bz2 19204540 BLAKE2B 2192a7dc7418826440209dd8c7a73fd5ced491b799975b953368daeabb429327a6c518a1212a2fd49c34c6e5ab7d84f240cbf6ff8b3779e2d38f5ad81499ee71 SHA512 41a92711a9278261879caec1a01425104b7c75346b3c6ad9617cab025309c9b38f79eea2d04122f5ae6ce273fcd61fbde8a0d23756313a4593394230b51a1d4c

diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
index 6d9caa8c84a..101bb8b3411 100644
--- a/dev-embedded/sdcc/metadata.xml
+++ b/dev-embedded/sdcc/metadata.xml
@@ -17,28 +17,35 @@ microprocessors.
 		<remote-id type="sourceforge">sdcc</remote-id>
 	</upstream>
 	<use>
-		<flag name="avr">Add support for AVR -- not supported upstream</flag>
 		<flag name="boehm-gc">Enable Hans Boehm's garbage collector <pkg>dev-libs/boehm-gc</pkg></flag>
 		<flag name="device-lib">Enable built of devices libraries</flag>
-		<flag name="ds390">Add support for Dallas DS390</flag>
-		<flag name="ds400">Add support for Dallas DS400</flag>
-		<flag name="gbz80">Add support for Gameboy gbz80</flag>
-		<flag name="hc08">Add support for Freescale/Motorola HC08 based</flag>
-		<flag name="mcs51">Add support for Intel mcs51</flag>
 		<flag name="non-free">Enable non-free runtime library parts</flag>
 		<flag name="packihx">Enable Intel HEX files pack utility</flag>
-		<flag name="pic14">Add support for Microchip 14 bits PICs</flag>
-		<flag name="pic16">Add support for Microchip 16 bits PICs</flag>
-		<flag name="r2k">Add support for Rabbit 2000</flag>
-		<flag name="r3ka">Add support for Rabbit 3000A</flag>
-		<flag name="s08">Add support for Freescale/Motorola S08</flag>
 		<flag name="sdbinutils">Enable SDCC library archive utilities sdar, sdranlib, sdnm</flag>
 		<flag name="sdcdb">Enable SDCC source level debugger</flag>
 		<flag name="sdcpp">Enable SDCC preprocessor based on GCC cpp</flag>
-		<flag name="stm8">Add support for STMicroelectronics STM8</flag>
-		<flag name="tlcs90">Add support for TLCS-90</flag>
 		<flag name="ucsim">Enable software simulator for microcontrollers</flag>
-		<flag name="z180">Add support for Zilog Z180</flag>
+
+		<!-- ports in order defined by configure.ac -->
+		<flag name="avr">Add support for AVR -- not supported upstream</flag>
+		<flag name="mcs51">Add support for Intel mcs51</flag>
 		<flag name="z80">Add support for Zilog Z80</flag>
+		<flag name="z180">Add support for Zilog Z180</flag>
+		<flag name="r2k">Add support for Rabbit 2000</flag>
+		<flag name="r3ka">Add support for Rabbit 3000A</flag>
+		<flag name="gbz80">Add support for Gameboy gbz80</flag>
+		<flag name="tlcs90">Add support for TLCS-90</flag>
+		<flag name="ez80-z80">Add support for EZ80-Z80</flag>
+		<flag name="ds390">Add support for Dallas DS390</flag>
+		<flag name="ds400">Add support for Dallas DS400</flag>
+		<flag name="pic14">Add support for Microchip 14 bits PICs</flag>
+		<flag name="pic16">Add support for Microchip 16 bits PICs</flag>
+		<flag name="hc08">Add support for Freescale/Motorola HC08 based</flag>
+		<flag name="s08">Add support for Freescale/Motorola S08</flag>
+		<flag name="stm8">Add support for STMicroelectronics STM8</flag>
+		<flag name="pdk13">Add support for PDK13</flag>
+		<flag name="pdk14">Add support for PDK14</flag>
+		<flag name="pdk15">Add support for PDK15</flag>
+		<flag name="pdk16">Add support for PDK16</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-4.0.0.ebuild
similarity index 89%
copy from dev-embedded/sdcc/sdcc-9999.ebuild
copy to dev-embedded/sdcc/sdcc-4.0.0.ebuild
index 73a2c6190d4..010160b22da 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-4.0.0.ebuild
@@ -24,9 +24,21 @@ LICENSE="
 	packihx? ( public-domain )
 "
 SLOT="0"
+# in order of configure.ac's AC_DO_PORT stanzas
 SDCC_PORTS="
-	avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180
-	z80
+	avr
+	mcs51
+	z80 z180
+	r2k r3ka
+	gbz80
+	tlcs90
+	ez80-z80
+	ds390 ds400
+	pic14 pic16
+	hc08
+	s08
+	stm8
+	pdk13 pdk14 pdk15 pdk16
 "
 IUSE="
 	${SDCC_PORTS}
@@ -87,29 +99,36 @@ src_configure() {
 		ac_cv_prog_AR="$(tc-getAR)" \
 		ac_cv_prog_AS="$(tc-getAS)" \
 		ac_cv_prog_STRIP=true \
-		$(use_enable avr avr-port) \
 		$(use_enable boehm-gc libgc) \
 		$(use_enable device-lib) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable mcs51 mcs51-port) \
 		$(use_enable non-free) \
 		$(use_enable packihx) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable s08 s08-port) \
 		$(use_enable sdbinutils) \
 		$(use_enable sdcdb) \
 		$(use_enable sdcpp) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable tlcs90 tlcs90-port) \
 		$(use_enable ucsim) \
-		$(use_enable z180 z180-port) \
+		\
+		$(use_enable avr avr-port) \
+		$(use_enable mcs51 mcs51-port) \
 		$(use_enable z80 z80-port) \
+		$(use_enable z180 z180-port) \
+		$(use_enable r2k r2k-port) \
+		$(use_enable r3ka r3ka-port) \
+		$(use_enable gbz80 gbz80-port) \
+		$(use_enable tlcs90 tlcs90-port) \
+		$(use_enable ez80-z80 ez80_z80-port) \
+		$(use_enable ds390 ds390-port) \
+		$(use_enable ds400 ds400-port) \
+		$(use_enable pic14 pic14-port) \
+		$(use_enable pic16 pic16-port) \
+		$(use_enable hc08 hc08-port) \
+		$(use_enable s08 s08-port) \
+		$(use_enable stm8 stm8-port) \
+		$(use_enable pdk13 pdk13-port) \
+		$(use_enable pdk14 pdk14-port) \
+		$(use_enable pdk15 pdk15-port) \
+		$(use_enable pdk16 pdk16-port) \
+		\
 		--disable-doc \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache

diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 73a2c6190d4..010160b22da 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -24,9 +24,21 @@ LICENSE="
 	packihx? ( public-domain )
 "
 SLOT="0"
+# in order of configure.ac's AC_DO_PORT stanzas
 SDCC_PORTS="
-	avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180
-	z80
+	avr
+	mcs51
+	z80 z180
+	r2k r3ka
+	gbz80
+	tlcs90
+	ez80-z80
+	ds390 ds400
+	pic14 pic16
+	hc08
+	s08
+	stm8
+	pdk13 pdk14 pdk15 pdk16
 "
 IUSE="
 	${SDCC_PORTS}
@@ -87,29 +99,36 @@ src_configure() {
 		ac_cv_prog_AR="$(tc-getAR)" \
 		ac_cv_prog_AS="$(tc-getAS)" \
 		ac_cv_prog_STRIP=true \
-		$(use_enable avr avr-port) \
 		$(use_enable boehm-gc libgc) \
 		$(use_enable device-lib) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable mcs51 mcs51-port) \
 		$(use_enable non-free) \
 		$(use_enable packihx) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable s08 s08-port) \
 		$(use_enable sdbinutils) \
 		$(use_enable sdcdb) \
 		$(use_enable sdcpp) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable tlcs90 tlcs90-port) \
 		$(use_enable ucsim) \
-		$(use_enable z180 z180-port) \
+		\
+		$(use_enable avr avr-port) \
+		$(use_enable mcs51 mcs51-port) \
 		$(use_enable z80 z80-port) \
+		$(use_enable z180 z180-port) \
+		$(use_enable r2k r2k-port) \
+		$(use_enable r3ka r3ka-port) \
+		$(use_enable gbz80 gbz80-port) \
+		$(use_enable tlcs90 tlcs90-port) \
+		$(use_enable ez80-z80 ez80_z80-port) \
+		$(use_enable ds390 ds390-port) \
+		$(use_enable ds400 ds400-port) \
+		$(use_enable pic14 pic14-port) \
+		$(use_enable pic16 pic16-port) \
+		$(use_enable hc08 hc08-port) \
+		$(use_enable s08 s08-port) \
+		$(use_enable stm8 stm8-port) \
+		$(use_enable pdk13 pdk13-port) \
+		$(use_enable pdk14 pdk14-port) \
+		$(use_enable pdk15 pdk15-port) \
+		$(use_enable pdk16 pdk16-port) \
+		\
 		--disable-doc \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache