diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /app-arch/innoextract | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'app-arch/innoextract')
| -rw-r--r-- | app-arch/innoextract/Manifest | 7 | ||||
| -rw-r--r-- | app-arch/innoextract/files/innoextract-1.9-fix-linkage.patch | 17 | ||||
| -rw-r--r-- | app-arch/innoextract/innoextract-1.7.ebuild | 35 | ||||
| -rw-r--r-- | app-arch/innoextract/innoextract-1.9.ebuild (renamed from app-arch/innoextract/innoextract-1.8.ebuild) | 8 |
4 files changed, 26 insertions, 41 deletions
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest index ae67fade65cf..9d04d453e838 100644 --- a/app-arch/innoextract/Manifest +++ b/app-arch/innoextract/Manifest @@ -1,5 +1,4 @@ -DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4 -DIST innoextract-1.8.tar.gz 205553 BLAKE2B 223f0997ae00f2a854912befca25595b275ece8e0fe4f4451d6aa3db14ad1ed98474a19c919c56d958e99c0175be647d3eb3c14d7869504405a7bf6db3a35957 SHA512 2c68009333f02a8a677c084e9c95c835d84a73e60c9b0c70fee5f23fd9a7a640cf2aa7e0476c55579774ac7079498fa24668f9388493bbc13415ff5a5b06ac9c -EBUILD innoextract-1.7.ebuild 731 BLAKE2B 2372ce7018c12a5317232d6ac6294297e017034059afbe49b934c017367cef9ff343b7d74f754b5409e212a907ea933d6e381c60a808534a7a667ae3f9cd1c72 SHA512 4f9f49dc8b2c5679bca97058401b5b071d879e192de1b6b2eeb5e43d0a2d41702fb100e7c45a22d3eca8020785e41c992e62e346432332ba684cf03e5dd3eded -EBUILD innoextract-1.8.ebuild 697 BLAKE2B 3cf1864fba834a0038fcd39931a0749df4789192b0a9e12623e12dec256daa51d681f4c99ba1e313ac41567e6eedbf03543c86239f476890bba12acd630facdc SHA512 ce1ae8711b92e47bfaea06d3c87db6c35d4b8039afb8975d5699297c8d9bf07f104163f9d3fbf4983c956b8e8621b7eb4ab7efe6dc6fcb1befdbce1da5bfbe86 +AUX innoextract-1.9-fix-linkage.patch 311 BLAKE2B 777d3592d3b0c5ced8a36473b9b481395e2ae4b33dedf1d8a7393b150a2c048c764b1f4902fdaa23ff68749d04f393668ae8b4ba7fd8bdb82f7cbfb4142391c2 SHA512 df4f251c36ed2e01314f12cecc44082c4ecbbe8bbef9825bce98cfc880a7e92047da17051879b4f2d972dadf6fc41f07338fa958d773847394be4441c5db0dea +DIST innoextract-1.9.tar.gz 206931 BLAKE2B 1d5f0d13a7cd52262b277263f061ecab85a3419197bceb22938a0d10000578603cc2c2b972a45474027cfea8e43b8bf89d680035034785210842477b147811fa SHA512 2b18f7bb7f50744bcb1bdcd25e57e0760193b179c77b55e0f63c537e55afc98de3b0380da3cae470ce97660ed41a7ffbb48c8c25329c9ce9b3811d9aec74bcde +EBUILD innoextract-1.9.ebuild 763 BLAKE2B 00483d46965f4c8a9948b1b90ed2dd2611284c1390d8756d6cf39943f530dabed4205bc09156a54c7eafeaa5c2077f737c28eee995ca6fbf7e1c93d6da5c4056 SHA512 534ea71db7bc4105ead308ff6c9714b6ebe6668bfd01ca82bc40b5bb89c72209fd0c39b9268b066939a381f60e6b99ee959609c01fa8266521eab7b5a8d352fe MISC metadata.xml 928 BLAKE2B 032de64587c2ab814a132d09f624a86f6b87a5fb1c49a1385969fcce89a7f75975480c8b3b70889621a97bb26e1d37240d51ef5a9da868983ee2467fc5c18f92 SHA512 0fb9ebc491eec20dbeee81d92ae7616464717c88684170ea064726b42120d65ac74edfac474e2605c191d91901e952859199c17bc84af3657812671cb3fb9260 diff --git a/app-arch/innoextract/files/innoextract-1.9-fix-linkage.patch b/app-arch/innoextract/files/innoextract-1.9-fix-linkage.patch new file mode 100644 index 000000000000..79ecd805f49d --- /dev/null +++ b/app-arch/innoextract/files/innoextract-1.9-fix-linkage.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index be9f08f..f7ce42a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -316,12 +316,6 @@ if(NOT MSVC) + + endif() + +-if($ENV{PORTAGE_REPO_NAME} MATCHES "gentoo") +- # Meh +- unset(LIBRARIES) +-endif() +- +- + # All sources: + + set(DOCUMENTATION 0) # never build these diff --git a/app-arch/innoextract/innoextract-1.7.ebuild b/app-arch/innoextract/innoextract-1.7.ebuild deleted file mode 100644 index de8c21556274..000000000000 --- a/app-arch/innoextract/innoextract-1.7.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="A tool to unpack installers created by Inno Setup" -HOMEPAGE="http://constexpr.org/innoextract/" -SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug +iconv +lzma" - -RDEPEND=" - dev-libs/boost:= - iconv? ( virtual/libiconv ) - lzma? ( app-arch/xz-utils )" -DEPEND="${RDEPEND}" - -DOCS=( README.md CHANGELOG ) - -src_configure() { - local mycmakeargs=( - -DDEBUG=$(usex debug) - -DSET_OPTIMIZATION_FLAGS=OFF - -DSTRICT_USE=ON - -DUSE_LZMA=$(usex lzma) - -DWITH_CONV=$(usex iconv iconv builtin) - ) - - cmake-utils_src_configure -} diff --git a/app-arch/innoextract/innoextract-1.8.ebuild b/app-arch/innoextract/innoextract-1.9.ebuild index 5cf62179ba29..31ff8072913f 100644 --- a/app-arch/innoextract/innoextract-1.8.ebuild +++ b/app-arch/innoextract/innoextract-1.9.ebuild @@ -11,15 +11,19 @@ SRC_URI="https://constexpr.org/innoextract/files/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="debug +iconv +lzma" RDEPEND=" - dev-libs/boost:= + dev-libs/boost:=[bzip2,zlib] iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.9-fix-linkage.patch" +) + src_configure() { local mycmakeargs=( -DDEBUG=$(usex debug) |