summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-09-16 20:18:14 +0200
committerDavid Seifert <soap@gentoo.org>2020-09-16 20:18:14 +0200
commit7fb382134282417f5054121d6bd61d60ae9a8e56 (patch)
tree81097993abcc6ba13b1166a4ebce111943729a16 /dev-embedded/uisp
parentdev-embedded/smdk-dltool: Port to EAPI 7 (diff)
downloadgentoo-7fb382134282417f5054121d6bd61d60ae9a8e56.tar.gz
gentoo-7fb382134282417f5054121d6bd61d60ae9a8e56.tar.bz2
gentoo-7fb382134282417f5054121d6bd61d60ae9a8e56.zip
dev-embedded/uisp: Port to EAPI 7
Closes: https://bugs.gentoo.org/729704 Closes: https://bugs.gentoo.org/742209 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-embedded/uisp')
-rw-r--r--dev-embedded/uisp/files/uisp-20050207-autotools.patch35
-rw-r--r--dev-embedded/uisp/files/uisp-20050207-clang.patch84
-rw-r--r--dev-embedded/uisp/files/uisp-20050207-mega-48-88-168.patch (renamed from dev-embedded/uisp/files/mega-48-88-168.patch)0
-rw-r--r--dev-embedded/uisp/uisp-20050207-r1.ebuild22
4 files changed, 131 insertions, 10 deletions
diff --git a/dev-embedded/uisp/files/uisp-20050207-autotools.patch b/dev-embedded/uisp/files/uisp-20050207-autotools.patch
new file mode 100644
index 00000000000..824ccf3b2b5
--- /dev/null
+++ b/dev-embedded/uisp/files/uisp-20050207-autotools.patch
@@ -0,0 +1,35 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,20 +44,8 @@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure src/config-h.in \
+ src/stamp-h.in $(AUX_DIST)
+
+-install_aux_files = AUTHORS COPYING INSTALL CHANGES CHANGES.old TODO \
++dist_doc_DATA = AUTHORS CHANGES CHANGES.old TODO \
+ ChangeLog ChangeLog-2003 ChangeLog-2002
+
+-DOC_INST_DIR = $(DESTDIR)$(datadir)/doc/uisp-$(VERSION)
+-
+-install-data-local:
+- $(mkinstalldirs) $(DOC_INST_DIR)
+- for file in $(install_aux_files) ; do \
+- echo " $(INSTALL_DATA) $$file $(DOC_INST_DIR)/$$file"; \
+- $(INSTALL_DATA) $(srcdir)/$$file $(DOC_INST_DIR)/$$file; \
+- done
+-
+-uninstall-local:
+- rm -rf $(DOC_INST_DIR)
+-
+ dist-hook: uisp.spec
+ cp uisp.spec $(distdir)/uisp.spec
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,7 +31,7 @@
+ # Turn on all warnings and consider them errors. This kinda forces you to have
+ # to use gcc, but I'd rather have all warnings eliminated.
+
+-AM_CXXFLAGS = -Wall -Werror
++AM_CXXFLAGS = -Wall
+
+ bin_PROGRAMS = uisp
+ uisp_SOURCES = \
diff --git a/dev-embedded/uisp/files/uisp-20050207-clang.patch b/dev-embedded/uisp/files/uisp-20050207-clang.patch
new file mode 100644
index 00000000000..c08943b9d9b
--- /dev/null
+++ b/dev-embedded/uisp/files/uisp-20050207-clang.patch
@@ -0,0 +1,84 @@
+--- a/src/AvrAtmel.C
++++ b/src/AvrAtmel.C
+@@ -185,7 +185,7 @@
+
+ void TAvrAtmel::SetAddress(TAddr addr){
+ apc_address = addr;
+- TByte setAddr [3] = { 'A', (addr>>8)&0xff, addr&0xff};
++ TByte setAddr [3] = { 'A', static_cast<TByte>((addr>>8)&0xff), static_cast<TByte>(addr&0xff)};
+ Send(setAddr, 3, 1);
+ CheckResponse(setAddr [0]);
+ }
+@@ -294,7 +294,7 @@
+ if (flush_buffer){WriteProgramMemoryPage();}
+ }
+
+- TByte wrF [2] = { (addr&1)?'C':'c', byte };
++ TByte wrF [2] = { static_cast<TByte>((addr&1)?'C':'c'), byte };
+
+ if (apc_address!=(addr>>1) || apc_autoinc==false) SetAddress (addr>>1);
+ if (wrF[0]=='C') apc_address++;
+@@ -346,7 +346,7 @@
+ */
+ void TAvrAtmel::WriteOldFuseBits (TByte val)
+ {
+- TByte buf[5] = {'.', 0xac, (val & 0x1f) | 0xa0, 0x00, 0xd2 };
++ TByte buf[5] = {'.', 0xac, static_cast<TByte>((val & 0x1f) | 0xa0), 0x00, 0xd2 };
+ Info (2, "Write fuse high bits: %02x\n", (int)val);
+ Send (buf, 5, 2);
+ CheckResponse (buf[1]);
+@@ -423,7 +423,7 @@
+ }
+
+ void TAvrAtmel::WriteLockBits(TByte bits){
+- TByte lockTarget [2] = { 'l', 0xF9 | ((bits << 1) & 0x06) };
++ TByte lockTarget [2] = { 'l', static_cast<TByte>(0xF9 | ((bits << 1) & 0x06)) };
+ Send (lockTarget, 2, 1);
+ CheckResponse(lockTarget [0]);
+ Info(1, "Writing lock bits ...\nReinitializing device\n");
+--- a/src/AvrDummy.C
++++ b/src/AvrDummy.C
+@@ -81,12 +81,12 @@
+ TAvrDummy::GetPartInfo(TAddr addr)
+ {
+ if (at89) {
+- TByte info [4] = { 0x28, addr & 0x1f, 0, 0 };
++ TByte info [4] = { 0x28, static_cast<TByte>(addr & 0x1f), 0, 0 };
+ Send(info, 4);
+ return info[3];
+ }
+
+- TByte info [4] = { 0x30, 0, addr, 0 };
++ TByte info [4] = { 0x30, 0, static_cast<TByte>(addr), 0 };
+ Send(info, 4);
+ return info[3];
+ }
+@@ -289,7 +289,7 @@
+ void
+ TAvrDummy::WriteOldFuseBits(TByte val)
+ {
+- TByte oldfuse[4] = { 0xAC, (val & 0x1F) | 0xA0, 0, 0xD2 };
++ TByte oldfuse[4] = { 0xAC, static_cast<TByte>((val & 0x1F) | 0xA0), 0, 0xD2 };
+ Send(oldfuse, 4);
+ }
+
+@@ -533,7 +533,7 @@
+ {
+ /* This handles both old (byte 2, bits 1-2)
+ and new (byte 4, bits 0-5) devices. */
+- TByte lock[4] = { 0xAC, 0xF9 | ((bits << 1) & 0x06), 0xFF, bits };
++ TByte lock[4] = { 0xAC, static_cast<TByte>(0xF9 | ((bits << 1) & 0x06)), 0xFF, bits };
+ TByte rbits;
+
+ if (at89)
+--- a/src/Stk500.C
++++ b/src/Stk500.C
+@@ -518,7 +518,7 @@
+
+ TByte TStk500::ReadCalFuseBits(int addr)
+ {
+- TByte cmd[] = { 0x38, 0x00, addr, 0x00 };
++ TByte cmd[] = { 0x38, 0x00, static_cast<TByte>(addr), 0x00 };
+
+ return UniversalCmd(cmd);
+ }
diff --git a/dev-embedded/uisp/files/mega-48-88-168.patch b/dev-embedded/uisp/files/uisp-20050207-mega-48-88-168.patch
index dad337b740a..dad337b740a 100644
--- a/dev-embedded/uisp/files/mega-48-88-168.patch
+++ b/dev-embedded/uisp/files/uisp-20050207-mega-48-88-168.patch
diff --git a/dev-embedded/uisp/uisp-20050207-r1.ebuild b/dev-embedded/uisp/uisp-20050207-r1.ebuild
index 2a92a428cdd..3db55410303 100644
--- a/dev-embedded/uisp/uisp-20050207-r1.ebuild
+++ b/dev-embedded/uisp/uisp-20050207-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils
+inherit autotools
DESCRIPTION="Tool for programming AVR microcontroller through the parallel port"
HOMEPAGE="https://savannah.nongnu.org/projects/uisp"
@@ -12,17 +12,19 @@ SRC_URI="https://savannah.nongnu.org/download/uisp/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+
+PATCHES=(
+ "${FILESDIR}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-mega-48-88-168.patch
+ "${FILESDIR}"/${P}-clang.patch
+)
src_prepare() {
- sed -i -e "/^DOC_INST_DIR/s:/[^/]*$:/${PF}:" Makefile.in || die
- cd src
- epatch "${FILESDIR}"/mega-48-88-168.patch
- sed -i -e 's: -Werror::' Makefile.in || die
+ default
+ eautoreconf
}
src_install() {
default
- dodoc doc/*
- rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+ dodoc -r doc/.
}