| 1 |
commit: 443eda5bdbf9ecbd8b056a9800361028c582ec39 |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 7 18:21:06 2021 +0000 |
| 4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 7 18:54:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443eda5b |
| 7 |
|
| 8 |
dev-embedded/parapin: Fix tc-directly |
| 9 |
|
| 10 |
- Port to EAPI-8 |
| 11 |
- Remove broken docs compilation |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/722632 |
| 14 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 15 |
|
| 16 |
.../parapin/files/parapin-1.5.0-tc-directly.patch | 23 +++++++++++++++++++ |
| 17 |
...arapin-1.5.0.ebuild => parapin-1.5.0-r1.ebuild} | 21 +++++++++-------- |
| 18 |
..._beta1.ebuild => parapin-1.5.1_beta1-r1.ebuild} | 26 ++++++++++------------ |
| 19 |
3 files changed, 45 insertions(+), 25 deletions(-) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..0289a070e2c |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-embedded/parapin/files/parapin-1.5.0-tc-directly.patch |
| 26 |
@@ -0,0 +1,23 @@ |
| 27 |
+diff --git a/Makefile-2.4 b/Makefile-2.4 |
| 28 |
+index b900268..9946cef 100644 |
| 29 |
+--- a/Makefile-2.4 |
| 30 |
++++ b/Makefile-2.4 |
| 31 |
+@@ -43,9 +43,6 @@ |
| 32 |
+ LINUX_HEADERS := /usr/src/linux-`uname -r`/include/ |
| 33 |
+ LINUX_MODULES := /lib/modules/`uname -r`/kernel/ |
| 34 |
+ |
| 35 |
+-CC := gcc |
| 36 |
+-CFLAGS := -O2 -g -Wall |
| 37 |
+- |
| 38 |
+ LIBPARAPIN_OBJS := parapin.o |
| 39 |
+ |
| 40 |
+ EXAMPLE_DIR := examples |
| 41 |
+@@ -82,7 +79,7 @@ allinstall: install modulesinstall $(BINDINGS)-install |
| 42 |
+ ##### libraries |
| 43 |
+ |
| 44 |
+ libparapin.a: $(LIBPARAPIN_OBJS) |
| 45 |
+- ar -cr libparapin.a $(LIBPARAPIN_OBJS) |
| 46 |
++ $(AR) -cr libparapin.a $(LIBPARAPIN_OBJS) |
| 47 |
+ |
| 48 |
+ parapin.o: parapin.c parapin.h parapin-linux.h |
| 49 |
+ $(CC) $(CFLAGS) -c parapin.c |
| 50 |
|
| 51 |
diff --git a/dev-embedded/parapin/parapin-1.5.0.ebuild b/dev-embedded/parapin/parapin-1.5.0-r1.ebuild |
| 52 |
similarity index 68% |
| 53 |
rename from dev-embedded/parapin/parapin-1.5.0.ebuild |
| 54 |
rename to dev-embedded/parapin/parapin-1.5.0-r1.ebuild |
| 55 |
index 0c172e5d1c8..eb1ca039789 100644 |
| 56 |
--- a/dev-embedded/parapin/parapin-1.5.0.ebuild |
| 57 |
+++ b/dev-embedded/parapin/parapin-1.5.0-r1.ebuild |
| 58 |
@@ -1,7 +1,8 @@ |
| 59 |
-# Copyright 1999-2018 Gentoo Authors |
| 60 |
+# Copyright 1999-2021 Gentoo Authors |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
-EAPI=7 |
| 64 |
+EAPI=8 |
| 65 |
+ |
| 66 |
inherit toolchain-funcs |
| 67 |
|
| 68 |
DESCRIPTION="A parallel port pin programming library" |
| 69 |
@@ -13,25 +14,23 @@ IUSE="doc" |
| 70 |
KEYWORDS="~amd64 ~x86" |
| 71 |
SLOT="0" |
| 72 |
|
| 73 |
-DEPEND="doc? ( dev-tex/latex2html )" |
| 74 |
+PATCHES=( |
| 75 |
+ "${FILESDIR}"/${P}-tc-directly.patch |
| 76 |
+) |
| 77 |
|
| 78 |
src_compile() { |
| 79 |
+ tc-export AR CC |
| 80 |
# Note 2.4 and 2.6 makefiles are identical for the targets used |
| 81 |
- emake -f Makefile-2.4 CC=$(tc-getCC) |
| 82 |
- use doc && emake -C doc html |
| 83 |
+ emake -f Makefile-2.4 |
| 84 |
} |
| 85 |
|
| 86 |
src_install() { |
| 87 |
+ einstalldocs |
| 88 |
dolib.a libparapin.a |
| 89 |
insopts -m0444; insinto /usr/include; doins parapin.h |
| 90 |
|
| 91 |
- dodoc README |
| 92 |
if use doc; then |
| 93 |
- cd "${S}"/doc/${PN} |
| 94 |
- docinto html |
| 95 |
- dodoc *.html *.css *.png |
| 96 |
- |
| 97 |
- cd "${S}"/examples |
| 98 |
+ cd examples || die |
| 99 |
docinto examples |
| 100 |
dodoc *.c |
| 101 |
fi |
| 102 |
|
| 103 |
diff --git a/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild b/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild |
| 104 |
similarity index 66% |
| 105 |
rename from dev-embedded/parapin/parapin-1.5.1_beta1.ebuild |
| 106 |
rename to dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild |
| 107 |
index 51556291ee4..ec6e6a5c1db 100644 |
| 108 |
--- a/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild |
| 109 |
+++ b/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild |
| 110 |
@@ -1,39 +1,37 @@ |
| 111 |
-# Copyright 1999-2018 Gentoo Authors |
| 112 |
+# Copyright 1999-2021 Gentoo Authors |
| 113 |
# Distributed under the terms of the GNU General Public License v2 |
| 114 |
|
| 115 |
-EAPI=7 |
| 116 |
+EAPI=8 |
| 117 |
+ |
| 118 |
inherit toolchain-funcs |
| 119 |
|
| 120 |
DESCRIPTION="A parallel port pin programming library" |
| 121 |
HOMEPAGE="http://parapin.sourceforge.net/" |
| 122 |
SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tgz" |
| 123 |
+S="${WORKDIR}/${P/_/-}" |
| 124 |
|
| 125 |
LICENSE="LGPL-2.1" |
| 126 |
-IUSE="doc" |
| 127 |
KEYWORDS="~amd64 ~x86" |
| 128 |
SLOT="0" |
| 129 |
+IUSE="doc" |
| 130 |
|
| 131 |
-DEPEND="doc? ( dev-tex/latex2html )" |
| 132 |
- |
| 133 |
-S=${WORKDIR}/${P/_/-} |
| 134 |
+PATCHES=( |
| 135 |
+ "${FILESDIR}"/${PN}-1.5.0-tc-directly.patch |
| 136 |
+) |
| 137 |
|
| 138 |
src_compile() { |
| 139 |
+ tc-export AR CC |
| 140 |
# Note 2.4 and 2.6 makefiles are identical for the targets used |
| 141 |
- emake -f Makefile-2.4 CC=$(tc-getCC) |
| 142 |
- use doc && emake -C doc html |
| 143 |
+ emake -f Makefile-2.4 |
| 144 |
} |
| 145 |
|
| 146 |
src_install() { |
| 147 |
+ einstalldocs |
| 148 |
dolib.a libparapin.a |
| 149 |
insopts -m0444; insinto /usr/include; doins parapin.h |
| 150 |
|
| 151 |
- dodoc README |
| 152 |
if use doc; then |
| 153 |
- cd "${S}"/doc/${PN} |
| 154 |
- docinto html |
| 155 |
- dodoc *.html *.css *.png |
| 156 |
- |
| 157 |
- cd "${S}"/examples |
| 158 |
+ cd examples || die |
| 159 |
docinto examples |
| 160 |
dodoc *.c |
| 161 |
fi |
Archives