gentoo resync : 08.10.2021

4 files changed, 48 insertions, 27 deletions

diff --git a/dev-embedded/parapin/Manifest b/dev-embedded/parapin/Manifest
index 2fa812f07f87..601095d1b6c3 100644
--- a/dev-embedded/parapin/Manifest
+++ b/dev-embedded/parapin/Manifest
@@ -1,5 +1,6 @@
+AUX parapin-1.5.0-tc-directly.patch 618 BLAKE2B b53d4a0d0a3f58be54bb1f25f2981c466265a410a99d82c18117d95bd3f2b83165e50459cab204302931673f236da48ca54dc7def1f89407357711c47823b0cd SHA512 83c53eb91b9dddc7912a8205df90c5f6c42dac68617733b088762cbd5be3a199641bf2283f7c2b8a321761e51c23126b62839a61ba26832a7656d3eb10406011
 DIST parapin-1.5.0.tgz 249552 BLAKE2B 2a6621ec21542c35dbcae48f1bb93cd36621878b3bdfcb75f3b22aaa861e730a0f9f80f0d83eb4335d7d3b4c6c471e83003da5daea6dddc87b6e3c86ef2c7229 SHA512 732a2e4145f9dc2b765ecd1fd52d56409e69f4e3dc885f10d37661ab551604b986c95466e7d45265a268f7e759f6aa65537d1a8efcdd57d2d8b0ddfd3484728d
 DIST parapin-1.5.1-beta1.tgz 279115 BLAKE2B cce949828fec7654917da54be30ac6ed07baad615180adebbd12caba0c994e62ae95cc10a00c3653d23fe75afbe0721d6da901829a99a89ab355ea059c99d0f5 SHA512 3bc1a0a9fef5fd5f8efd84220e7e257a100d618d168332fe09c1331c38fc48e339bfda3f216713f454f43487fd7227036d8f1025ccc851806ae69326bfae97e0
-EBUILD parapin-1.5.0.ebuild 783 BLAKE2B c9d7a92a0294ec8ae2d7b867f202467fd28837733e4da484ff95ea8e83162b21fa1d7ac2459f3acc04b072ceda7176c3bba9c88c1d71db4ab8d9ac83e72cafd0 SHA512 a7b8c5877c33ea020b009e14a1ffcea9fea5499e52bf401efdde362c946abcbaac9c6df604d4229614c1f000ed065d3a987c9f481f1ef2840855989d1b57c7d9
-EBUILD parapin-1.5.1_beta1.ebuild 810 BLAKE2B 99c362b3430175c174c899b1410afba351b364e6c6679e3fc6d979c9de423ca4bf0238d7e7e9aa1012934b45e78edf198cca1bdb12adce51178ea05e257096bc SHA512 c9282f2a69ec5c5d64a0b55a731588f711a72958fedcfe2d8f093b9c82ca70fce4f8564675ea3e423f624e58d32c61257b7ec3de11b869518394e6ecbe3aaced
+EBUILD parapin-1.5.0-r1.ebuild 704 BLAKE2B e17f8df72f13a2792a64dd47867be5a5f4e7fecba91ef366fd1bd4e1b0d54cac3dd991071469371d599b8ffdd3926c5b56bf82301293fe653f5732fb065cea91 SHA512 35deb22a229764adc700d4ce2a470352bf841c6cceb3ca5204b09122df9b937df1dc99f19f70d3c2d740404be2bf68646235c729328977074084113b259b30d3
+EBUILD parapin-1.5.1_beta1-r1.ebuild 739 BLAKE2B 4f3bfb768132c05b5ae83b36d5161219d9793014c1cb8d5edf2d5d4d94606847a5f0219ff935d9c38b7ac4fa475dec7e191ff7c60c8928d43f743be14eae8996 SHA512 2a48b8ff506b216843a9d306ed476baa4035488cbf2f7a9554c2669aed37654f70d338b2d8180dc6ec60c584c1f045f7d69c4eef06ac25ceb9ddac309133cce0
 MISC metadata.xml 988 BLAKE2B 1ff94dc4f00c09e8ef4224f0f3d5dc8c8314164bb3302a7c1778974e5062453b2f751c96ba8978c2935bba3e1ade26818d88bdf0965acd1d1cca215c2fa22357 SHA512 5df803ab0ec84a1d71d8887dc96b9a565875f3da839967205e5c0021ee3adf1fc027949298348a058aa6b9680ec9296ae14bdb75b55527c24b7989a820e45608
diff --git a/dev-embedded/parapin/files/parapin-1.5.0-tc-directly.patch b/dev-embedded/parapin/files/parapin-1.5.0-tc-directly.patch
new file mode 100644
index 000000000000..0289a070e2c3
--- /dev/null
+++ b/dev-embedded/parapin/files/parapin-1.5.0-tc-directly.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile-2.4 b/Makefile-2.4
+index b900268..9946cef 100644
+--- a/Makefile-2.4
++++ b/Makefile-2.4
+@@ -43,9 +43,6 @@
+ LINUX_HEADERS := /usr/src/linux-`uname -r`/include/
+ LINUX_MODULES := /lib/modules/`uname -r`/kernel/
+ 
+-CC := gcc
+-CFLAGS := -O2 -g -Wall
+-
+ LIBPARAPIN_OBJS := parapin.o
+ 
+ EXAMPLE_DIR := examples
+@@ -82,7 +79,7 @@ allinstall: install modulesinstall $(BINDINGS)-install
+ ##### libraries
+ 
+ libparapin.a: $(LIBPARAPIN_OBJS)
+-	ar -cr libparapin.a $(LIBPARAPIN_OBJS)
++	$(AR) -cr libparapin.a $(LIBPARAPIN_OBJS)
+ 
+ parapin.o: parapin.c parapin.h parapin-linux.h
+ 	$(CC) $(CFLAGS) -c parapin.c
diff --git a/dev-embedded/parapin/parapin-1.5.0.ebuild b/dev-embedded/parapin/parapin-1.5.0-r1.ebuild
index 0c172e5d1c89..eb1ca039789c 100644
--- a/dev-embedded/parapin/parapin-1.5.0.ebuild
+++ b/dev-embedded/parapin/parapin-1.5.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="A parallel port pin programming library"
@@ -13,25 +14,23 @@ IUSE="doc"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-DEPEND="doc? ( dev-tex/latex2html )"
+PATCHES=(
+	"${FILESDIR}"/${P}-tc-directly.patch
+)
 
 src_compile() {
+	tc-export AR CC
 	# Note 2.4 and 2.6 makefiles are identical for the targets used
-	emake -f Makefile-2.4 CC=$(tc-getCC)
-	use doc && emake -C doc html
+	emake -f Makefile-2.4
 }
 
 src_install() {
+	einstalldocs
 	dolib.a libparapin.a
 	insopts -m0444;	insinto /usr/include; doins parapin.h
 
-	dodoc README
 	if use doc; then
-		cd "${S}"/doc/${PN}
-		docinto html
-		dodoc *.html *.css *.png
-
-		cd "${S}"/examples
+		cd examples || die
 		docinto examples
 		dodoc *.c
 	fi
diff --git a/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild b/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild
index 51556291ee47..ec6e6a5c1db3 100644
--- a/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild
+++ b/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild
@@ -1,39 +1,37 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="A parallel port pin programming library"
 HOMEPAGE="http://parapin.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tgz"
+S="${WORKDIR}/${P/_/-}"
 
 LICENSE="LGPL-2.1"
-IUSE="doc"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
+IUSE="doc"
 
-DEPEND="doc? ( dev-tex/latex2html )"
-
-S=${WORKDIR}/${P/_/-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-tc-directly.patch
+)
 
 src_compile() {
+	tc-export AR CC
 	# Note 2.4 and 2.6 makefiles are identical for the targets used
-	emake -f Makefile-2.4 CC=$(tc-getCC)
-	use doc && emake -C doc html
+	emake -f Makefile-2.4
 }
 
 src_install() {
+	einstalldocs
 	dolib.a libparapin.a
 	insopts -m0444;	insinto /usr/include; doins parapin.h
 
-	dodoc README
 	if use doc; then
-		cd "${S}"/doc/${PN}
-		docinto html
-		dodoc *.html *.css *.png
-
-		cd "${S}"/examples
+		cd examples || die
 		docinto examples
 		dodoc *.c
 	fi