gentoo resync : 12.03.2021

5 files changed, 3 insertions, 171 deletions

diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 90866fc0422a..c507533705b9 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,9 +1,5 @@
-AUX ponyprog-2.07a-gcc43.patch 1428 BLAKE2B f650dba7b48c04bdd04b2fd6e39b75b081e4536c2bc21a22a41bd206a8dccb81ec10935df8fc9c7c7ec8ffc61c1258ab946f54bf507ba09d02484e9b21ade11c SHA512 8b14e521a333b22e52d55002b8c951a244d6c7703a05a98b02eebd11960937dd23c7a2084d067338c7b5def568d087ade8c49dffa52e1eaf1e692af910e875b3
-AUX ponyprog-2.07c-build.patch 1156 BLAKE2B 0ca295511ad34fa90f10a5a652d0c298b2d53909d8aa9759a0e419f0d98339864518704d1162f68567a74eb40744fcd2b6dcf5b52add36ebf31b529e665163c4 SHA512 4ecc4d2f96c43f76cebb8cad748e22188f27a47d3e7e91cbe0be5b704b3af0d2feba881c0c155538662de611a8f84bd9a3e10fae2d470c95b14e34d885b0d827
 AUX ponyprog-3.0.0-desktop-qa.patch 333 BLAKE2B ef21bb3f39a828317b1dddaccd36ec77b897250a54d4b07b2f7a40fbcaab0304937cc9e2170ee939f0214aef87ac09c1182d694a6d54ec59c52175d93e055152 SHA512 d5e04646720bf34b600dc90aa5013a0267fb4168d47860ef0bbbb12a465f59f784a0dd611e14d2a2884b814d385f24adcc65afeb99d58209677618c0d18c0dd7
 AUX ponyprog-3.0.0-fix-build-system.patch 4477 BLAKE2B 0c933f8b7e330f2c9a428d3cb0974550180b460fe1ebe2ac22cb98e4f7de579d2b5fb2e3d24ad227184396650b2ea6041ff36dd5e08db4c4d720e5ba5bb9e2a9 SHA512 5c8be7660d770bb7120b69e70f5a08ddec2568f2c930d780c6fa5bbcd09edf3e624d97497d3740c9d6c199db9878cccadc78e6da35d8a2b43d5d9a1a8e89851f
-DIST Pony_Prog2000-2.07c.tar.gz 653300 BLAKE2B 7b20450dfefb4370fb813b5532e6ba504b6ac8e598a2e46615ba522537e91b7798f6f86fbf93320fc71be5fe756ceef3351304196da191f7e68670f75ab5f865 SHA512 33cd14fa8283ce8af8265a48df7d960c7c2779551d0f204f6728a9e1e54204f52ea608c4e6090dc56f7634a02abd9bb960230f75a3a9716b1639708a57c31809
 DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
-EBUILD ponyprog-2.07c-r2.ebuild 1524 BLAKE2B a24728569c6f90893d93402e699f80f268aa6f8e7d600de54abcb8cd9d46d3c0bf35117d6a82ea68410fc44487b6e6af5e015f72ba8d32ce9a562d094c989165 SHA512 c58116fa5bacc879f7c824bcdd7f80fc5e7b65ba17a8b45073019ef1f31665bb5b2c6536e4408b7f4570fd4c976c2d5dc7fff31ddf11407ee809ec42ff00759d
-EBUILD ponyprog-3.0.0.ebuild 1073 BLAKE2B bfc27e35898d2053bebdd10c4f09c8df61086865c5f2ea412f25b67ae79b292f84164c86892b004a836b74220b7c2a8c133640b06d2e7aefafeb2a6f34587da0 SHA512 5503142132170aa275bd01aab58c35ef892fa6273cd17efe10c903822d449b5b4f3bc77b469b9fd9b1dbd8e0f8a7000a6b6898737d8253fafce36d8506395f58
+EBUILD ponyprog-3.0.0.ebuild 1068 BLAKE2B 849d35644c72b705444062fec7e30cf4383f7fc230da62261e2358fdf20760fefa6e3250845e2d28c1eee35e036709c82fd55fd81b12124dc59f922f25182cda SHA512 2c671813476d272dd53f44f4bfa62b7c4579925a4ed4725d20f1ccac4667847c326c9ae0265c03fd852b5565f9e31c43c57fc13988e37b2c01b5d5ae39d0eee4
 MISC metadata.xml 607 BLAKE2B 81117395201c00d6de624c70c682a345258849b4b389537855aa762d0f282ab7becf1461a3260fea8e54f96efa5fdc1543e51be860a242bc50915a375c9089a6 SHA512 f48ae88969bcefcb9977f4c58f2cf3367fd8a557df36a0f18fa013b9d41fc3e9880dcb41ae27181015191096e8812b817f6a314c4459605cb56e13b7e0919383
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
deleted file mode 100644
index f93da01d646c..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-http://bugs.gentoo.org/227503
-
---- a/v/includex/v/vpsdc.h
-+++ b/v/includex/v/vpsdc.h
-@@ -14,7 +14,9 @@
- 
- #include <v/vdc.h>
- #include <v/vprinter.h>
--#include <fstream.h>
-+#include <fstream>
-+
-+using namespace std;
- 
-     class vPostScriptDC : public vDC
-       {
---- a/v/includex/v/vpsprntr.h
-+++ b/v/includex/v/vpsprntr.h
-@@ -14,7 +14,7 @@
- 
- #include <v/v_defs.h>
- #include <v/vmodald.h>
--#include <fstream.h>
-+#include <fstream>
- 
- #define vPaperLetter 0
- #define vPaperLegal 1
-@@ -31,6 +31,8 @@
- #define vPaperQuarto 12
- #define vPaper10x14 13
- 
-+using namespace std;
-+
- #define vPaperDefault vPaperLetter		// Index to default paper
- 
-     class vPSPrinter : public vModalDialog
---- a/v/srcx/vpsprntr.cxx
-+++ b/v/srcx/vpsprntr.cxx
-@@ -103,7 +103,7 @@ static unsigned char prompt_bits[] = {
-     _height = PaperHeights[_paperType];
-     _portrait = 1;
-     _useColor = 0;
--    _pstream = 0;
-+    vPSPrinter::_pstream = 0;
- 
-     ++_instances;		// bump reference counter
-   }
---- a/rs232int.cpp
-+++ b/rs232int.cpp
-@@ -145,7 +145,7 @@ int RS232Interface::OpenSerial(int no)
- 		snprintf(lockname, MAXPATH, LOCK_DIR "/LCK..ttyS%d", no);
- 		UserDebug1(UserApp2, "RS232Interface::OpenSerial() now lock the device %s\n", lockname);
- 
--		fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT);
-+		fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT,0664);
- 		if (fd < 0)
- 		{
- 			fd = open ((const char *)lockname,O_RDONLY);
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch b/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
deleted file mode 100644
index cc29d2f1060e..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix parallel make and respect CC, CXX and LDFLAGS
-
-http://bugs.gentoo.org/282244
-http://bugs.gentoo.org/317767
-
---- Makefile
-+++ Makefile
-@@ -331,8 +331,8 @@
- 
- prps:	$(PRPS)
- 
--$(PROG):	$(OBJS)
--	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-+$(PROG):	$(OBJS) vlib
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
- 
- %.o: %.cpp
- 	$(CXX) $(CFLAGS) -c $< -o $@
---- v/Config.mk
-+++ v/Config.mk
-@@ -40,8 +40,6 @@
- #---------------------------------------------------------------------
- #CC	=	gcc
- #CXX	=	g++
--CC	=	gcc-3.4
--CXX	=	g++-3.4
- 
- #---------------------------------------------------------------------
- # VPATH for dependencies on header files
-@@ -302,5 +300,3 @@
- #---------------------------------------------------------------------
- # LINK/LOAD options
- #---------------------------------------------------------------------
--LDFLAGS	=	$(LIBDIR) $(LIBS)
--
---- v/srcx/Makefile
-+++ v/srcx/Makefile
-@@ -142,7 +142,6 @@
- 	vprogrsc.h vsliderc.h vtextinc.h vlistc.h vcomboc.h vtextc.h \
- 	vcolor.h vpen.h vclabelc.h vspinc.h
- 
--	cd iconed ; $(MAKE) ARCH=$@ ; cd ..
- 
- 
- #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild b/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild
deleted file mode 100644
index f24977b23f45..000000000000
--- a/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Serial device programmer"
-HOMEPAGE="http://www.lancos.com/ppwin95.html"
-SRC_URI="mirror://sourceforge/${PN}/Pony_Prog2000-${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-misc/xdg-utils"
-DEPEND="${RDEPEND}
-	virtual/imagemagick-tools"
-
-S="${WORKDIR}/PonyProg2000-${PV}"
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-O2::' v/Config.mk || die
-	sed -i -e '/include.*<asm\/io.h>/s:asm:sys:' *.cpp || die
-	sed -i -e 's/netscape/xdg-open/' e2cmdw.cpp || die
-
-	convert ponyprog.ico ponyprog.png
-
-	epatch \
-		"${FILESDIR}/${PN}-2.07a-gcc43.patch" \
-		"${FILESDIR}/${PN}-2.07c-build.patch"
-	epatch_user
-}
-
-src_compile() {
-	tc-export CC CXX
-	# most of build is C++, but it uses CFLAGS
-	CFLAGS="${CXXFLAGS}" emake HOMEV="${S}/v"
-}
-
-src_install() {
-	dobin bin/ponyprog2000
-	keepdir /var/lock/uucp
-	fowners uucp:uucp /var/lock/uucp
-	fperms 755 /var/lock/uucp
-	doicon ponyprog.png
-	make_desktop_entry ponyprog2000 PonyProg2000 ponyprog
-}
-
-pkg_postinst() {
-	elog "To use the COM port in user mode (not as root), you need to"
-	elog "be in the 'uucp' group."
-	elog
-	elog "To use the LPT port in user mode (not as root) you need a kernel with"
-	elog "ppdev, parport and parport_pc compiled in or as modules. You need the"
-	elog "rights to write to /dev/parport? devices."
-}
diff --git a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
index 4c7bfaeb8f8c..b9a935a5c1a2 100644
--- a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND=">=app-editors/qhexedit2-0.8.4_p20170719