diff --git a/app-emulation/opencbm/ChangeLog b/app-emulation/opencbm/ChangeLog index 23cd9aaf..0156d545 100644 --- a/app-emulation/opencbm/ChangeLog +++ b/app-emulation/opencbm/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2022 Gentoo Authors; Distributed under the GPL v2 # $Header: $ + 05 Apr 2022; Mario Fetka opencbm-0.4.99.104.ebuild, + opencbm-9999.ebuild: + app-emulation/opencbm: update metadata + 05 Apr 2022; Mario Fetka metadata.xml: app-emulation/opencbm: update metadata diff --git a/app-emulation/opencbm/Manifest b/app-emulation/opencbm/Manifest index fcacc31b..e8985599 100644 --- a/app-emulation/opencbm/Manifest +++ b/app-emulation/opencbm/Manifest @@ -2,7 +2,7 @@ AUX 001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c AUX Makefile 1003 BLAKE2B 9e6363f8fb20826f380bae087f461b0f87a2f118be223ca809c84dba7154c6493b8937d7a46437a1773afaf5ba58179d33f9599b0fc063ae53bd5f9984128fa5 SHA512 a15c0d5a962d183f6753844aad38ef111ba4c34a4a3c8f947142b7cb5f71868ed77e965317c5aed10b9e3b5a8cb978fdffd505dbc11a6868615e5f11b19b7bd1 DIST nibtools-0.4.99.104-source.tar.gz 118200 BLAKE2B c0232c3e591fcc34979cf11663ec4e466d765cd423ef8e56a981c1fc6454c5c2315541961258840341d45a7639e0baad1877bd76e0b2bd9f8885bba72ee8cc87 SHA512 3936c5e68251f7f11a8d912374265ff150887efdf97eb86520413616b14ad689ef0eaa6f8f0b4b66b20e9e5b2733651784a263aafe2522093a39035ac35ec4da DIST opencbm-0.4.99.104-source.tar.gz 13417312 BLAKE2B 1ba6e88c8765a161d6cb7a1c313c2db6cc885c616ac110c0833f59c93e2b2081e67ce730a7ead123a59b83133ddc2edf448de694c72ca582c3a155a463175027 SHA512 1c5c09ed2fd37a6db152eb9739739edee8b2200a4e02b219e982337eeb935cdac1125f59f235b5c3d1203bcd0701c2e9e35da9de921797f1617014f723de0faa -EBUILD opencbm-0.4.99.104.ebuild 3528 BLAKE2B 5020774685cb58ccd1bb15799c08922c2e4526b7a2aea6403c54f7436c06cf9f7494f38d094659cef81b5e11e12d67edf8caf123d7b3a98b07da4088f228aeae SHA512 7dcb2938a8532ca6fac35836e93c806a32c55ec857723cea870fe72b4d180273e29ceef485fc53d2227f84deecbfece5279170a96a5bfb12560c3a02bafa1af0 -EBUILD opencbm-9999.ebuild 3257 BLAKE2B 09c6923d0dc3a8992a0892f5fd371bd88ce2db3d8b8f53109e5f3e0fc8c610591005b5c6c02434b5e526feece95ef81faeb1cf78b65df1a2d1231a37057294cb SHA512 4e0169e145c136ff9145698fe337166b513a3b148903b6c560308748a1122f991ba3bb13057f4248ef9a3b62889a4883fbc1178bc1bee1cbbe13d79470872038 -MISC ChangeLog 1123 BLAKE2B 24323af25f3d4f35633d93667cd77598f52c4d5e1bc4b190bfa8de41ade5b28423fe184d6c7403262c3c29af7c1f14336e0474b5942bafaec1f2d3ccf6f6b9e6 SHA512 f2ce30ce6809054738f97aeaae4ea81b01cb04da4c259806c324a8187d7601c293444190ba16bb25d1488bc7c4404c347a4be5d476605592a5902e8b094387f3 +EBUILD opencbm-0.4.99.104.ebuild 3370 BLAKE2B 9990251e19349a5ca79f8925b047ab05062677ef78677b2d2a139ccff5a4add99341a9a2092057e37c150682c57706128651d6de391a9e3206eaa3e9aa942076 SHA512 8ec85812c968b89e82e840da724448644c1768d37d861d368cf6c20724c153bbb0d856449e1257c230f18ca2f1326de7cedd1c7dfd242f0eeb4dfc8a043b5541 +EBUILD opencbm-9999.ebuild 3370 BLAKE2B 9990251e19349a5ca79f8925b047ab05062677ef78677b2d2a139ccff5a4add99341a9a2092057e37c150682c57706128651d6de391a9e3206eaa3e9aa942076 SHA512 8ec85812c968b89e82e840da724448644c1768d37d861d368cf6c20724c153bbb0d856449e1257c230f18ca2f1326de7cedd1c7dfd242f0eeb4dfc8a043b5541 +MISC ChangeLog 1266 BLAKE2B c0347d5e0361182d79816ff25a52e2d52c52cf932adab716503f8a738da6c0643d08f4d14b9315ea6a9f2bf8e056c1da91a2a2515684f85a8f204e16731a7a7e SHA512 d3cea999760ee90a45148f31963a532ce3ff6db7122b11b8b06ca094f3d936309a2c8cc90e15fc7af86bda40952b28667db403b30c26c0189a083f9bc447b466 MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c diff --git a/app-emulation/opencbm/opencbm-0.4.99.104.ebuild b/app-emulation/opencbm/opencbm-0.4.99.104.ebuild index 8c60991c..b377a948 100644 --- a/app-emulation/opencbm/opencbm-0.4.99.104.ebuild +++ b/app-emulation/opencbm/opencbm-0.4.99.104.ebuild @@ -1,38 +1,36 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: $ EAPI="7" inherit eutils toolchain-funcs linux-mod udev if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenCBM/OpenCBM.git" + inherit git-r3 + EGIT_REPO_URI="https://github.com/OpenCBM/OpenCBM.git" + KEYWORDS="" else - #SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz" - #SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2" - SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz - https://github.com/OpenCBM/nibtools/tarball/master -> nibtools-${PV}-source.tar.gz" + #SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz" + #SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2" + SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz + https://github.com/OpenCBM/nibtools/tarball/master -> nibtools-${PV}-source.tar.gz" + KEYWORDS="~amd64 ~ppc ~sparc ~x86" fi - SDIR="include libmisc arch/linux lib cbmctrl cbmformat d64copy cbmcopy libtrans cbmforng d82copy demo/flash demo/morse demo/rpm1541 sample/libtrans cbmrpm41" -DESCRIPTION="OpenCBM is a package to control and use serial devices as used by most Commodore (CBM) 8-bit mach" +DESCRIPTION="OpenCBM is a tool to use serial devices as used by most Commodore (CBM) machines" HOMEPAGE="http://opencbm.trikaliotis.net/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -#KEYWORDS="" IUSE="doc" DEPEND="virtual/linux-sources dev-embedded/cc65 app-text/linuxdoc-tools app-text/docbook-xml-dtd:4.1.2 - dev-libs/libusb-compat" + virtual/libusb:0" S="${WORKDIR}"/OpenCBM-${PV//./_} @@ -50,15 +48,15 @@ src_prepare() { eapply "${FILESDIR}/001_opencbm-0.4.99.98-ncurses6-1.patch" # sed correct path sed -e 's,^PREFIX.*,PREFIX = /usr,' \ - -e 's,/man/man1,/share/man/man1,g' \ - -e 's,etc/udev/rules.d,lib/udev/rules.d,g' \ - -e 's,/info,/share/info,g' -i ${S}/opencbm/LINUX/config.make + -e 's,/man/man1,/share/man/man1,g' \ + -e 's,etc/udev/rules.d,lib/udev/rules.d,g' \ + -e 's,/info,/share/info,g' -i "${S}"/opencbm/LINUX/config.make # sed correct path sed -e 's,xa1541 opencbm/sys/linux/,xa1541,g' \ - -e 's,etc/udev/rules.d,lib/udev/rules.d,g' -i ${S}/LINUX/Makefile + -e 's,etc/udev/rules.d,lib/udev/rules.d,g' -i "${S}"/LINUX/Makefile # copy module makefile that don't intefer with gentoo kernel build system - cp ${FILESDIR}/Makefile ${S}/opencbm/sys/linux/Makefile - cp -r "${WORKDIR}"/OpenCBM-nibtools-*/* ${S}/opencbm/nibtools/ + cp "${FILESDIR}"/Makefile "${S}"/opencbm/sys/linux/Makefile + cp -r "${WORKDIR}"/OpenCBM-nibtools-*/* "${S}"/opencbm/nibtools/ eapply_user } @@ -78,25 +76,24 @@ src_install() { newexe debian/install_plugin.sh install_plugin insinto lib/udev/rules.d newins opencbm/sys/linux/45-opencbm-xa1541.rules 45-opencbm-xa1541.rules - rm -rf ${D}/var + rm -rf "${D}"/var linux-mod_src_install - generate_modulesd -# exit 1 + generate_modulesd } pkg_postinst() { - linux-mod_pkg_postinst - ${EROOT}/usr/lib/opencbm/install_plugin install xa1541 - ${EROOT}/usr/lib/opencbm/install_plugin install xu1541 - ${EROOT}/usr/lib/opencbm/install_plugin install xum1541 + linux-mod_pkg_postinst + "${EROOT}"/usr/lib/opencbm/install_plugin install xa1541 + "${EROOT}"/usr/lib/opencbm/install_plugin install xu1541 + "${EROOT}"/usr/lib/opencbm/install_plugin install xum1541 } pkg_prerm() { - ${EROOT}/usr/lib/opencbm/install_plugin uninstall xa1541 - ${EROOT}/usr/lib/opencbm/install_plugin uninstall xu1541 - ${EROOT}/usr/lib/opencbm/install_plugin uninstall xum1541 + "${EROOT}"/usr/lib/opencbm/install_plugin uninstall xa1541 + "${EROOT}"/usr/lib/opencbm/install_plugin uninstall xu1541 + "${EROOT}"/usr/lib/opencbm/install_plugin uninstall xum1541 } pkg_postrm() { - linux-mod_pkg_postrm + linux-mod_pkg_postrm } diff --git a/app-emulation/opencbm/opencbm-9999.ebuild b/app-emulation/opencbm/opencbm-9999.ebuild index c20c546c..b377a948 100644 --- a/app-emulation/opencbm/opencbm-9999.ebuild +++ b/app-emulation/opencbm/opencbm-9999.ebuild @@ -1,37 +1,36 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: $ EAPI="7" inherit eutils toolchain-funcs linux-mod udev if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenCBM/OpenCBM.git" + inherit git-r3 + EGIT_REPO_URI="https://github.com/OpenCBM/OpenCBM.git" + KEYWORDS="" else - #SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz" - #SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2" - SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz" + #SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz" + #SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2" + SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz + https://github.com/OpenCBM/nibtools/tarball/master -> nibtools-${PV}-source.tar.gz" + KEYWORDS="~amd64 ~ppc ~sparc ~x86" fi - SDIR="include libmisc arch/linux lib cbmctrl cbmformat d64copy cbmcopy libtrans cbmforng d82copy demo/flash demo/morse demo/rpm1541 sample/libtrans cbmrpm41" -DESCRIPTION="OpenCBM is a package to control and use serial devices as used by most Commodore (CBM) 8-bit mach" +DESCRIPTION="OpenCBM is a tool to use serial devices as used by most Commodore (CBM) machines" HOMEPAGE="http://opencbm.trikaliotis.net/" LICENSE="GPL-2" SLOT="0" -#KEYWORDS="~amd64 ~ppc ~sparc ~x86" -KEYWORDS="" IUSE="doc" DEPEND="virtual/linux-sources dev-embedded/cc65 app-text/linuxdoc-tools app-text/docbook-xml-dtd:4.1.2 - dev-libs/libusb-compat" + virtual/libusb:0" S="${WORKDIR}"/OpenCBM-${PV//./_} @@ -49,19 +48,21 @@ src_prepare() { eapply "${FILESDIR}/001_opencbm-0.4.99.98-ncurses6-1.patch" # sed correct path sed -e 's,^PREFIX.*,PREFIX = /usr,' \ - -e 's,/man/man1,/share/man/man1,g' \ - -e 's,etc/udev/rules.d,lib/udev/rules.d,g' \ - -e 's,/info,/share/info,g' -i ${S}/opencbm/LINUX/config.make + -e 's,/man/man1,/share/man/man1,g' \ + -e 's,etc/udev/rules.d,lib/udev/rules.d,g' \ + -e 's,/info,/share/info,g' -i "${S}"/opencbm/LINUX/config.make # sed correct path sed -e 's,xa1541 opencbm/sys/linux/,xa1541,g' \ - -e 's,etc/udev/rules.d,lib/udev/rules.d,g' -i ${S}/LINUX/Makefile + -e 's,etc/udev/rules.d,lib/udev/rules.d,g' -i "${S}"/LINUX/Makefile # copy module makefile that don't intefer with gentoo kernel build system - cp ${FILESDIR}/Makefile ${S}/opencbm/sys/linux/Makefile + cp "${FILESDIR}"/Makefile "${S}"/opencbm/sys/linux/Makefile + cp -r "${WORKDIR}"/OpenCBM-nibtools-*/* "${S}"/opencbm/nibtools/ eapply_user } src_compile() { emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" all || die "make fail" + emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" opencbm || die "make fail" linux-mod_src_compile } @@ -75,25 +76,24 @@ src_install() { newexe debian/install_plugin.sh install_plugin insinto lib/udev/rules.d newins opencbm/sys/linux/45-opencbm-xa1541.rules 45-opencbm-xa1541.rules - rm -rf ${D}/var + rm -rf "${D}"/var linux-mod_src_install - generate_modulesd -# exit 1 + generate_modulesd } pkg_postinst() { - linux-mod_pkg_postinst - ${EROOT}/usr/lib/opencbm/install_plugin install xa1541 - ${EROOT}/usr/lib/opencbm/install_plugin install xu1541 - ${EROOT}/usr/lib/opencbm/install_plugin install xum1541 + linux-mod_pkg_postinst + "${EROOT}"/usr/lib/opencbm/install_plugin install xa1541 + "${EROOT}"/usr/lib/opencbm/install_plugin install xu1541 + "${EROOT}"/usr/lib/opencbm/install_plugin install xum1541 } pkg_prerm() { - ${EROOT}/usr/lib/opencbm/install_plugin uninstall xa1541 - ${EROOT}/usr/lib/opencbm/install_plugin uninstall xu1541 - ${EROOT}/usr/lib/opencbm/install_plugin uninstall xum1541 + "${EROOT}"/usr/lib/opencbm/install_plugin uninstall xa1541 + "${EROOT}"/usr/lib/opencbm/install_plugin uninstall xu1541 + "${EROOT}"/usr/lib/opencbm/install_plugin uninstall xum1541 } pkg_postrm() { - linux-mod_pkg_postrm + linux-mod_pkg_postrm }