From e36e9340f0ca3d28a0baf8584ab61c40a14cdc22 Mon Sep 17 00:00:00 2001 From: layman Date: Thu, 24 Jun 2021 15:01:29 +0200 Subject: [PATCH] Cleanup --- dev-libs/pigpio/Manifest | 4 -- .../pigpio/files/pigpio-44-MakeRemote.patch | 29 -------- .../pigpio/files/pigpio-9999-Makefile.patch | 46 ------------- dev-libs/pigpio/metadata.xml | 11 --- dev-libs/pigpio/pigpio-9999.ebuild | 69 ------------------- sci-electronics/minipro/Manifest | 2 +- sci-electronics/minipro/minipro-9999.ebuild | 6 +- sci-electronics/pulseview/Manifest | 2 +- .../pulseview/pulseview-9999.ebuild | 6 +- 9 files changed, 8 insertions(+), 167 deletions(-) delete mode 100644 dev-libs/pigpio/Manifest delete mode 100644 dev-libs/pigpio/files/pigpio-44-MakeRemote.patch delete mode 100644 dev-libs/pigpio/files/pigpio-9999-Makefile.patch delete mode 100644 dev-libs/pigpio/metadata.xml delete mode 100644 dev-libs/pigpio/pigpio-9999.ebuild diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest deleted file mode 100644 index e6ffbec..0000000 --- a/dev-libs/pigpio/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX pigpio-44-MakeRemote.patch 813 BLAKE2B 65730fabed5016f9c93193417e90683292171ab7b6cac46bd9eeb4ef550115bfd8de3f549d4aa06e09cf942eb887ddda59901806e914b2ed3d6523c353d7b2e7 SHA512 fcc6c3a27f889b688928c3c65683c91b449eff3de692fed33f1465f97ff7c30844a5927dfef96225034831a4a3512f245292ce1efe5fac6c3f7f2472a7987cd8 -AUX pigpio-9999-Makefile.patch 1962 BLAKE2B 73833ae5cfaeeaed28bf62073b11f6c0b88d1487f02c1010b9459926aaa911bd785a4517738f2441afebc22331469c7878460bf27b3ea5b900b8a4ecbba98dd6 SHA512 a181163ca0848766f1eee96cc3408d0f227f0281f8f1efb0d7530dbed2b5b42b94ce76e3b9bcfccb2c85e6c3bfc6f2048403a9ccaee45a0653ef52608a1234f3 -EBUILD pigpio-9999.ebuild 1548 BLAKE2B 57596aefe9298fabb3622df1ac85d3baeea45e036f877234a0b7f5c4414460f0025d6c74133043a644ad954b15a761964515b9097d6720c91a2547222bb3f6c6 SHA512 c1a62443acc90cda2f0014a67aaebef325d8205d83e12482d6fdc49b428821c16984e74fe7d55619aca526c9c1b1952c6bcd47a195c5fe8b46ed384eaf6fd336 -MISC metadata.xml 297 BLAKE2B b97ca67fe97dad72b5e8a79755f3888c8c48bd22a0766607b4b09859dcae7cebedcb33e02c5231025ac8e45506c195750e6eb8cfbbb5908ed94979c1ef194b4f SHA512 9284ce2486abe9a813147f1fc1d395fffd5f20f652281077ff39c823eb10a317fe5dd14413e39f3a6d25b8814535482105fcba8ba6af0988a2141e403d3b3d8b diff --git a/dev-libs/pigpio/files/pigpio-44-MakeRemote.patch b/dev-libs/pigpio/files/pigpio-44-MakeRemote.patch deleted file mode 100644 index b019045..0000000 --- a/dev-libs/pigpio/files/pigpio-44-MakeRemote.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- pigpio-9999/MakeRemote -+++ pigpio-9999/MakeRemote -@@ -1,8 +1,4 @@ - # --CC = gcc --SIZE = size --SHLIB = gcc -shared --STRIPLIB = strip --strip-unneeded - - CFLAGS += -O3 -Wall -pthread - -@@ -9,7 +9,7 @@ - bindir = $(exec_prefix)/bin - includedir = $(prefix)/include - libdir = $(prefix)/lib --mandir = $(prefix)/man -+mandir = $(prefix)/share/man - - all: $(ALL) pigpio.py setup.py - -@@ -48,8 +44,6 @@ - install -m 0644 libpigpiod_if2.so $(DESTDIR)$(libdir) - install -m 0755 -d $(DESTDIR)$(bindir) - install -m 0755 pigs $(DESTDIR)$(bindir) -- python2 setup.py install -- python3 setup.py install - install -m 0755 -d $(DESTDIR)$(mandir)/man1 - install -m 0644 *.1 $(DESTDIR)$(mandir)/man1 - install -m 0755 -d $(DESTDIR)$(mandir)/man3 diff --git a/dev-libs/pigpio/files/pigpio-9999-Makefile.patch b/dev-libs/pigpio/files/pigpio-9999-Makefile.patch deleted file mode 100644 index b812fd0..0000000 --- a/dev-libs/pigpio/files/pigpio-9999-Makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur pigpio-9999.orig/Makefile pigpio-9999/Makefile ---- pigpio-9999.orig/Makefile 2019-03-05 12:26:57.330266931 +0100 -+++ pigpio-9999/Makefile 2019-03-05 17:15:42.301814015 +0100 -@@ -1,15 +1,6 @@ - # - # Set CROSS_PREFIX to prepend to all compiler tools at once for easier - # cross-compilation. --CROSS_PREFIX = --CC = $(CROSS_PREFIX)gcc --AR = $(CROSS_PREFIX)ar --RANLIB = $(CROSS_PREFIX)ranlib --SIZE = $(CROSS_PREFIX)size --STRIP = $(CROSS_PREFIX)strip --SHLIB = $(CC) -shared --STRIPLIB = $(STRIP) --strip-unneeded -- - SOVERSION = 1 - - CFLAGS += -O3 -Wall -pthread -@@ -38,7 +29,7 @@ - bindir = $(exec_prefix)/bin - includedir = $(prefix)/include - libdir = $(prefix)/lib --mandir = $(prefix)/man -+mandir = $(prefix)/share/man - - all: $(ALL) - -@@ -103,8 +94,6 @@ - install -m 0755 pig2vcd $(DESTDIR)$(bindir) - install -m 0755 pigpiod $(DESTDIR)$(bindir) - install -m 0755 pigs $(DESTDIR)$(bindir) -- if which python2; then python2 setup.py install $(PYINSTALLARGS); fi -- if which python3; then python3 setup.py install $(PYINSTALLARGS); fi - install -m 0755 -d $(DESTDIR)$(mandir)/man1 - install -m 0644 *.1 $(DESTDIR)$(mandir)/man1 - install -m 0755 -d $(DESTDIR)$(mandir)/man3 -@@ -126,8 +115,6 @@ - rm -f $(DESTDIR)$(bindir)/pig2vcd - rm -f $(DESTDIR)$(bindir)/pigpiod - rm -f $(DESTDIR)$(bindir)/pigs -- if which python2; then python2 setup.py install $(PYINSTALLARGS) --record /tmp/pigpio >/dev/null; sed 's!^!$(DESTDIR)!' < /tmp/pigpio | xargs rm -f >/dev/null; fi -- if which python3; then python3 setup.py install $(PYINSTALLARGS) --record /tmp/pigpio >/dev/null; sed 's!^!$(DESTDIR)!' < /tmp/pigpio | xargs rm -f >/dev/null; fi - rm -f $(DESTDIR)$(mandir)/man1/pig*.1 - rm -f $(DESTDIR)$(mandir)/man1/libpigpio*.1 - rm -f $(DESTDIR)$(mandir)/man3/pig*.3 diff --git a/dev-libs/pigpio/metadata.xml b/dev-libs/pigpio/metadata.xml deleted file mode 100644 index 0cfdb0c..0000000 --- a/dev-libs/pigpio/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - -xmw@gentoo.org -Michael Weber - - - Only build remote access support - - diff --git a/dev-libs/pigpio/pigpio-9999.ebuild b/dev-libs/pigpio/pigpio-9999.ebuild deleted file mode 100644 index 94ee9ea..0000000 --- a/dev-libs/pigpio/pigpio-9999.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_SETUPTOOLS=no -inherit eutils git-r3 toolchain-funcs distutils-r1 - -DESCRIPTION="C library for the Raspberry allowing control of general purpose input outputs" -HOMEPAGE="http://abyz.co.uk/rpi/pigpio" -EGIT_REPO_URI="https://github.com/joan2937/${PN}" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="" -IUSE="examples python remote" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -src_prepare() { - default - epatch \ - "${FILESDIR}"/${P}-Makefile.patch \ - "${FILESDIR}"/${PN}-44-MakeRemote.patch - # "${FILESDIR}"/${PN}-44-format-security.patch \ - - tc-export CC AR RANLIB - export SIZE="$(tc-getAR)" - export SIZE="${SIZE/-ar/-size}" - export SHLIB="$(tc-getCC) -shared" - export STRIPLIB="true" - - use python && distutils-r1_src_prepare -} - -src_configure() { - use python && distutils-r1_src_configure -} - -src_compile() { - if use remote ; then - emake -f MakeRemote libpigpiod_if.so - emake -f MakeRemote libpigpiod_if2.so - emake -f MakeRemote - else - emake - fi - - use python && distutils-r1_src_compile -} - -src_install() { - if use remote ; then - emake -f MakeRemote install prefix="${EROOT}"usr libdir="$(get_libdir)" DESTDIR="${D}" - else - emake install prefix="${EROOT}"usr libdir="$(get_libdir)" DESTDIR="${D}" - fi - - use python && distutils-r1_src_install - - if use examples ; then - dodoc -r EXAMPLES - fi -} diff --git a/sci-electronics/minipro/Manifest b/sci-electronics/minipro/Manifest index 2b5c914..51c5cd8 100644 --- a/sci-electronics/minipro/Manifest +++ b/sci-electronics/minipro/Manifest @@ -1,4 +1,4 @@ AUX minipro-9999-firmware-03.2.86.patch 1008 BLAKE2B 83500ef8376c0af9800d2e1986b2143795f0a6ca935a5efe34447a3b3ff9b0384c403e7d548f3cc6a7021eb4eb91605e81cfe4bbdbe760004827abe7917b3edd SHA512 a05e9eeed2144d75d1b0bdc7886f5c108a5207faedbe0e96cfa1d8cfd043f90e6ce5cff5bbf6782498d2cfd9b89cb90d566f21977872810cf74573578b7b8cf6 AUX minipro-9999-infoic.patch 3180 BLAKE2B 916cbb4b3c72652ca677a1093c71adf8f33da4f8f27d18546bb90b8a22f27782e9b073fc2ec0146f2a9614dce1d210b2dc1a6eafce0eb46085c32bef49f5d058 SHA512 fd10c24d039eb832b52dd3db4b29c56e3ad7a892e2eb78870d79064d0ea5d16217ac040f094d8669b19ebd21e33791a8c82a396f1e809bce3f846973c4489d0e AUX minipro-9999-voltages.patch 340 BLAKE2B 0da44851a5d1910dae6d27f416059947a6c303a7ec4906abad4dbbc508fbd606147372c99decff152e5829debd8c95cf28754b9518a5c61970a835bbb250e71c SHA512 3be8c037a4801ea00bff65bada29d920609cdb5c78d69b5b93caaff27a40804909d37804e563cdf240af1af364f3743a09e3f946f85921aab578888aca7f2015 -EBUILD minipro-9999.ebuild 833 BLAKE2B ed75157a84eb0be8340cff170370034ee0dcec6a1e92764c39c42f5faa9f733ef8898e062f7c37da92a57f49f45f6d56e9a1c8cf6302d3a9a5c3b098bdd1c41f SHA512 be5f4ee2b8c371a31def069130e34236914685d4b7730704c7537e6b61b12d47985464fcfc9e48f040bc90bc563e3373037d49865686d2912b810e77bf577454 +EBUILD minipro-9999.ebuild 826 BLAKE2B bacd033593da76c81d8e50e414b8b85b8517538fd5be036d6264baa0b1cddd59ebb92cb8ff6045c105a4417896c8ee201f269be30b8b555e0f627c5712378b70 SHA512 d29394bf749d8166b1a136cfc1964749c41f1bce54a6da65e70106e87d2a95ded85557cb0a3199b5512136248a2b7a61783d37ec6fe35994f10c1d74b872a04a diff --git a/sci-electronics/minipro/minipro-9999.ebuild b/sci-electronics/minipro/minipro-9999.ebuild index 4fd7fc0..567391d 100644 --- a/sci-electronics/minipro/minipro-9999.ebuild +++ b/sci-electronics/minipro/minipro-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit eutils bash-completion-r1 git-r3 udev +inherit bash-completion-r1 git-r3 udev DESCRIPTION="A free and open TL866XX programmer" HOMEPAGE="https://gitlab.com/DavidGriffith/minipro" @@ -19,8 +19,8 @@ RDEPEND="virtual/libusb:1 DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}/${P}-infoic.patch" || die - epatch "${FILESDIR}/${P}-voltages.patch" || die + eapply "${FILESDIR}/${P}-infoic.patch" || die + eapply "${FILESDIR}/${P}-voltages.patch" || die default } diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest index 326e228..1045aaf 100644 --- a/sci-electronics/pulseview/Manifest +++ b/sci-electronics/pulseview/Manifest @@ -1,3 +1,3 @@ AUX pulseview-0.4.2-glib-2.68.patch 579 BLAKE2B 1feab8b80bbfd158bc445fe32e72327451791e461a4f85129f125cb3fb3d247f581a54c517f9b26c6493d4536e412c245805583a998fb44d3ee6f43904c34888 SHA512 a8fccfe78c6ba09687db9b26bdb7c28ba8912098d7b4b41c62afdcc312462159bfe6f5f6055171f0e38fb96c64ad09dce66ed509286bc268bd785f8025ff7403 -EBUILD pulseview-9999.ebuild 1453 BLAKE2B abe7dba6590636908bd8296bb5a9b30680cc7b96abec908fd7733b3991a4f4e998ae89338915051db07c747b1a6420ce1836608f2e0cf97a54eaa6729dfe3cd6 SHA512 73e16a7e85bdbfeae2f4cac156898d7beac0b303f124affe6f0662c6862162cd939623aedb316412e91f0085edc566fe9e66fa495e1fbb7b34abe8f823c2e417 +EBUILD pulseview-9999.ebuild 1456 BLAKE2B 80df68e3e2f56eae0ea47ea03138d55e0e0c6cb47a38e4f7c94612d36daf7abcf416b7cc375c02af5dd9f8ed198b9cc76191b3571bebe5fa1e06178708f51783 SHA512 1b899dfade2842baedefb94ac64a8d8fe35dc9bcdcb088313666b17a7e66366a28941b036a7a5d8585ce07dbb7fb36096df37b587a082e83f40ca1a92007efc2 MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild index 20ea92e..36c61f9 100644 --- a/sci-electronics/pulseview/pulseview-9999.ebuild +++ b/sci-electronics/pulseview/pulseview-9999.ebuild @@ -45,9 +45,9 @@ DEPEND="${RDEPEND}" DOCS=( HACKING NEWS README ) -PATCHES=( - "${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch -) +#PATCHES=( +# "${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch +#) pkg_setup() { use decode && python_setup