Updated xc3sprog

dev-embedded/gpsim/Manifest

@@ -1,3 +1,3 @@
 DIST gpsim-0.31.0.tar.gz 3454179 BLAKE2B 449f891c7a765ce06da87c8de1a8adc0d7e15c9af175fc2988d604660108c14cc816247358a71bbb55813c5144f6973c01d3c9c27c44f2a45820b85cedc97d2c SHA512 a6af7e9170cee11c35f0e4731d39876e563edd8ca9cbd0f4b3017f224e5317b4c8bcc8aa4468102fa5c11157f487b6c7354e3aba8778842ed0b5be9bbb9ef45f
 EBUILD gpsim-0.31.0.ebuild 959 BLAKE2B e0d45355c6da332fcd1104aabad620fca0fdabded0798289ab38998847d6a248c5550e0b8e4c6fa074adfde19c931ea1c0dbf3b9352e52bc8dfc1cd248b6357c SHA512 ba35b163e0eebbca2114cb66fc984fb14226d37435c54e24652f110cd4b59ae0d539d02107a234ca3ba037b053d67420aec0e69097700c8ed9ddf2853e7d8de6
-EBUILD gpsim-9999.ebuild 1549 BLAKE2B 79f20565a2ec36e43d3d8580882fec5d7d87a5d8a6f65d9e80334cf9d83baf12e38996f73204826305e56c281dea827d877d28bb455c7591cce14ab1163f842c SHA512 268dc1964ac8cf2ba122b8bae0716a8778185f50be64957fa505b3a776f631f6b1a082ef93bf978a2e803322a4b480c1da026f1425213afce2b3c90e2b215974
+EBUILD gpsim-9999.ebuild 1643 BLAKE2B 8484d1e4b7e02c171abeba045b05988382ae41e0eb704bd1f2f7fd294763c6339270a5b4ed5ac85e617ccfed4c133194556ff0f61002097f34a35e5389721414 SHA512 967a525be14b9373962671ffc5bd8a0937924e981bd38cfe069ea7d33d62378dff8b8099cbd7e16d77e9657f632e466f8ebb6e94de147bcd096c6a0325dec97a

dev-embedded/gpsim/gpsim-9999.ebuild

@@ -36,7 +36,9 @@ src_prepare() {
 	default
 
 	sed -i "${S}/doc/Makefile.am" \
-		-e "s|lyx -e|lyx -userdir $WORKDIR -e|" || die
+		-e "s|all: gpsim\.ps gpsim\.pdf|all:gpsim.pdf|" \
+		-e "/lyx -e/i\\\trm -rf ${S}/cache" \
+		-e "s|lyx -e|lyx -userdir ${S} -v -f -e|" || die
 
 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf

dev-embedded/xc3sprog/Manifest

@@ -1,2 +1 @@
-AUX xc3sprog-9999-gcc-11.patch 1103 BLAKE2B da8c9b3740eedeb7694060c00f599871dd1f6ca5de26733f016e7d8574dd1db1114549c291a67c4d0b07fa83ae7f07b8d0930c349b35be5aeaba770501c37b38 SHA512 dba3a7f773ee513a6c81da24d86d23f7f94956b90fb30f1285e4fa590913bb19cc4cd91fcf27dd7d5ef936cbcc76cbf653987c3b949983d2d6c80f193ba22008
+EBUILD xc3sprog-9999.ebuild 1105 BLAKE2B dea09ea006911b4cc6211467a959a142f6363cf3b218dd5ed679b7e523711951bdf76909f268b8f563a85b30dd0fd32a0bc15490f8d4e19c89ede011ed87bded SHA512 65a702cb722fb458b8b30c568df6a24e2c66fb067e212ef9b944e1344e48cddfe1e029bc99e89411cd993fad98335bcd6f4013e37e8f291fa2aa567896dc409e
-EBUILD xc3sprog-9999.ebuild 1195 BLAKE2B 171be31e807e596c38e804747eb444c94afbf037669ecf6c6e7d8ebae2d78ff80432f278864194b750b4a569991e93f97ddc85b403a9a720195e590929d12ece SHA512 a3febbb423f6c2a804e5dc081888d2f1a09285bffc12741088b26a632f00132e6ea5b1087446dae0735cd36bf19b081e0ccd296a923cdb03b110c820ae5d0d6b

dev-embedded/xc3sprog/files/xc3sprog-9999-gcc-11.patch

@@ -1,41 +0,0 @@
-diff -urN xc3sprog-9999.orig/bitfile.cpp xc3sprog-9999/bitfile.cpp
---- xc3sprog-9999.orig/bitfile.cpp	2021-05-18 10:59:54.579686957 +0200
-+++ xc3sprog-9999/bitfile.cpp	2021-05-18 11:05:54.542944129 +0200
-@@ -35,7 +35,7 @@
- #include <time.h>
- #include "bitrev.h"
- 
--using namespace std;
-+//using namespace std;
- 
- BitFile::BitFile()
-   : length(0)
-@@ -607,14 +607,14 @@
-   return clip;
- }
- 
--void BitFile::error(const string &str)
-+void BitFile::error(const std::string &str)
- {
-   errorStr=str;
-   Error=true;
-   fprintf(logfile,"%s\n",str.c_str());
- }
- 
--void BitFile::readField(string &field, FILE *fp)
-+void BitFile::readField(std::string &field, FILE *fp)
- {
-   byte t[2];
-   fread(t,1,2,fp); 
-diff -urN xc3sprog-9999.orig/srecfile.cpp xc3sprog-9999/srecfile.cpp
---- xc3sprog-9999.orig/srecfile.cpp	2021-05-18 10:59:54.613019051 +0200
-+++ xc3sprog-9999/srecfile.cpp	2021-05-18 11:06:12.015624765 +0200
-@@ -28,7 +28,7 @@
- #include <string.h>
- #include <stdlib.h>
- 
--using namespace std;
-+//using namespace std;
- 
- int SrecFile::DecodeSRecordLine(char *source, unsigned char *dest, S_Record *SRec)
- {

dev-embedded/xc3sprog/xc3sprog-9999.ebuild

@@ -27,10 +27,6 @@ src_prepare() {
 		CMakeLists.txt || die
 	sed -i -e 's#usr/lib#opt/lib64#' FindlibFTD2XX.cmake || die
 
-	if [ $(gcc-major-version) -gt "10" ]; then
-		eapply "${FILESDIR}/${P}-gcc-11.patch"
-	fi
-
 	cmake-utils_src_prepare
 	default
 }