diff options
Diffstat (limited to 'app-arch/wimlib')
| -rw-r--r-- | app-arch/wimlib/Manifest | 2 | ||||
| -rw-r--r-- | app-arch/wimlib/wimlib-1.13.0.ebuild | 34 | ||||
| -rw-r--r-- | app-arch/wimlib/wimlib-1.13.3.ebuild (renamed from app-arch/wimlib/wimlib-1.12.0.ebuild) | 32 |
3 files changed, 35 insertions, 33 deletions
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest index 01df841c87a7..05d9a3f639db 100644 --- a/app-arch/wimlib/Manifest +++ b/app-arch/wimlib/Manifest @@ -1,2 +1,2 @@ -DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9 DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb +DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4 diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild index 3fb8e91ab6c9..a6578586e5cf 100644 --- a/app-arch/wimlib/wimlib-1.13.0.ebuild +++ b/app-arch/wimlib/wimlib-1.13.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools pax-utils if [[ -z ${PV%%*9999} ]]; then inherit git-r3 EGIT_REPO_URI="git://wimlib.net/${PN}" else - inherit vcs-snapshot MY_PV="${PV/_/-}" MY_PV="${MY_PV^^}" - SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -20,28 +19,31 @@ HOMEPAGE="https://wimlib.net/" LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0" SLOT="0" -IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm" +IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm" REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )" -PATCHES=( "${FILESDIR}/syslinux-path.patch" ) +RESTRICT="!test? ( test )" +BDEPEND=" + virtual/pkgconfig + cpu_flags_x86_ssse3? ( + yasm? ( dev-lang/yasm ) + !yasm? ( dev-lang/nasm ) + ) +" RDEPEND=" dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) - openssl? ( dev-libs/openssl:0 ) + openssl? ( dev-libs/openssl:0= ) iso? ( app-arch/cabextract app-cdr/cdrtools ) " -DEPEND=" - ${RDEPEND} - cpu_flags_x86_ssse3? ( - yasm? ( dev-lang/yasm ) - !yasm? ( dev-lang/nasm ) - ) -" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/syslinux-path.patch" ) src_prepare() { default @@ -55,15 +57,15 @@ src_configure() { $(use_enable cpu_flags_x86_ssse3 ssse3-sha1) $(use_with openssl libcrypto) $(use_enable threads multithreaded-compression) + $(use_enable test test-support) --disable-static ) - has test ${FEATURES} && myeconfargs+=( --enable-test-support ) ac_cv_prog_NASM="$(usex yasm yasm nasm)" \ econf "${myeconfargs[@]}" } src_compile() { - emake + default pax-mark m "${S}"/.libs/wimlib-imagex } diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.13.3.ebuild index 3fb8e91ab6c9..a6115205d0c9 100644 --- a/app-arch/wimlib/wimlib-1.12.0.ebuild +++ b/app-arch/wimlib/wimlib-1.13.3.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools pax-utils if [[ -z ${PV%%*9999} ]]; then inherit git-r3 EGIT_REPO_URI="git://wimlib.net/${PN}" else - inherit vcs-snapshot MY_PV="${PV/_/-}" MY_PV="${MY_PV^^}" - SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -20,28 +19,29 @@ HOMEPAGE="https://wimlib.net/" LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0" SLOT="0" -IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm" +IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm" REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )" -PATCHES=( "${FILESDIR}/syslinux-path.patch" ) +RESTRICT="!test? ( test )" +BDEPEND=" + virtual/pkgconfig + cpu_flags_x86_ssse3? ( + yasm? ( dev-lang/yasm ) + !yasm? ( dev-lang/nasm ) + ) +" RDEPEND=" dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) - openssl? ( dev-libs/openssl:0 ) + openssl? ( dev-libs/openssl:0= ) iso? ( app-arch/cabextract app-cdr/cdrtools ) " -DEPEND=" - ${RDEPEND} - cpu_flags_x86_ssse3? ( - yasm? ( dev-lang/yasm ) - !yasm? ( dev-lang/nasm ) - ) -" +DEPEND="${RDEPEND}" src_prepare() { default @@ -55,15 +55,15 @@ src_configure() { $(use_enable cpu_flags_x86_ssse3 ssse3-sha1) $(use_with openssl libcrypto) $(use_enable threads multithreaded-compression) + $(use_enable test test-support) --disable-static ) - has test ${FEATURES} && myeconfargs+=( --enable-test-support ) ac_cv_prog_NASM="$(usex yasm yasm nasm)" \ econf "${myeconfargs[@]}" } src_compile() { - emake + default pax-mark m "${S}"/.libs/wimlib-imagex } |