diff options
author | Sam James <sam@gentoo.org> | 2022-09-09 09:58:55 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2022-09-09 09:58:55 +0200 |
commit | d6dde05fd30196106515eea7cbb443696dafb40c (patch) | |
tree | 6edc813789db4fe242bb542b59d5a7973ef9e4ce /dev-libs/libmspack | |
parent | dev-libs/libgpiod: drop multilib, static-libs (diff) | |
download | gentoo-d6dde05fd30196106515eea7cbb443696dafb40c.tar.gz gentoo-d6dde05fd30196106515eea7cbb443696dafb40c.tar.bz2 gentoo-d6dde05fd30196106515eea7cbb443696dafb40c.zip |
dev-libs/libmspack: drop multilib, static-libs, EAPI 8
No multilib or static-libs reverse dependencies.
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-libs/libmspack')
-rw-r--r-- | dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild (renamed from dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild) | 52 | ||||
-rw-r--r-- | dev-libs/libmspack/libmspack-9999.ebuild | 54 |
2 files changed, 47 insertions, 59 deletions
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild index 35e40b93e7ce..1c6a56dacf44 100644 --- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild +++ b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal +inherit autotools -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/kyz/libmspack.git" inherit git-r3 MY_P="${PN}-9999" @@ -21,53 +21,47 @@ HOMEPAGE="https://www.cabextract.org.uk/libmspack/" LICENSE="LGPL-2.1" SLOT="0" -IUSE="debug doc static-libs" - -DEPEND="" -RDEPEND="" +IUSE="debug doc" S="${WORKDIR}/${MY_P}" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999 ]] ; then # Re-create file layout from release tarball - pushd "${WORKDIR}" &>/dev/null || die + pushd "${WORKDIR}" > /dev/null || die + cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die rm -r "${S}" || die mv "${WORKDIR}"/${PN}-source "${S}" || die - popd &>/dev/null || die + + popd > /dev/null || die fi default eautoreconf - - multilib_copy_sources } -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) \ - $(use_enable static-libs static) +src_configure() { + econf $(use_enable debug) } -multilib_src_test() { - if multilib_is_native_abi; then - default - cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die - fi +src_test() { + default + + cd "${S}"/test || die + ./cabd_test || die } -multilib_src_install_all() { - DOCS=(AUTHORS ChangeLog NEWS README TODO) - use doc && HTML_DOCS=(doc/*) - default_src_install - if use doc; then +src_install() { + use doc && HTML_DOCS=( doc/. ) + + default + + if use doc ; then rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die fi find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi + find "${ED}" -name "*.a" -delete || die } diff --git a/dev-libs/libmspack/libmspack-9999.ebuild b/dev-libs/libmspack/libmspack-9999.ebuild index 098660213fe6..1c6a56dacf44 100644 --- a/dev-libs/libmspack/libmspack-9999.ebuild +++ b/dev-libs/libmspack/libmspack-9999.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -inherit autotools multilib-minimal +inherit autotools -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/kyz/libmspack.git" inherit git-r3 MY_P="${PN}-9999" else - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" MY_PV="${PV/_alpha/alpha}" MY_P="${PN}-${MY_PV}" SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz" @@ -21,53 +21,47 @@ HOMEPAGE="https://www.cabextract.org.uk/libmspack/" LICENSE="LGPL-2.1" SLOT="0" -IUSE="debug doc static-libs" - -DEPEND="" -RDEPEND="" +IUSE="debug doc" S="${WORKDIR}/${MY_P}" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999 ]] ; then # Re-create file layout from release tarball - pushd "${WORKDIR}" &>/dev/null || die + pushd "${WORKDIR}" > /dev/null || die + cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die rm -r "${S}" || die mv "${WORKDIR}"/${PN}-source "${S}" || die - popd &>/dev/null || die + + popd > /dev/null || die fi default eautoreconf - - multilib_copy_sources } -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) \ - $(use_enable static-libs static) +src_configure() { + econf $(use_enable debug) } -multilib_src_test() { - if multilib_is_native_abi; then - default - cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die - fi +src_test() { + default + + cd "${S}"/test || die + ./cabd_test || die } -multilib_src_install_all() { - DOCS=(AUTHORS ChangeLog NEWS README TODO) - use doc && HTML_DOCS=(doc/*) - default_src_install - if use doc; then +src_install() { + use doc && HTML_DOCS=( doc/. ) + + default + + if use doc ; then rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die fi find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi + find "${ED}" -name "*.a" -delete || die } |