From 6deea6f9112b20068bdb8e82f049e28508efac83 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:10:46 +0100 Subject: gentoo resync : 14.07.2018 --- app-arch/innoextract/Manifest | 8 +-- .../files/innoextract-1.4-cmake-3.5.patch | 31 --------- .../innoextract/files/innoextract-1.4-cmake.patch | 30 --------- app-arch/innoextract/innoextract-1.4.ebuild | 73 ---------------------- app-arch/innoextract/innoextract-1.5.ebuild | 39 ------------ app-arch/innoextract/metadata.xml | 1 - 6 files changed, 1 insertion(+), 181 deletions(-) delete mode 100644 app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch delete mode 100644 app-arch/innoextract/files/innoextract-1.4-cmake.patch delete mode 100644 app-arch/innoextract/innoextract-1.4.ebuild delete mode 100644 app-arch/innoextract/innoextract-1.5.ebuild (limited to 'app-arch/innoextract') diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest index 0ef0058d4867..9bf87a24919e 100644 --- a/app-arch/innoextract/Manifest +++ b/app-arch/innoextract/Manifest @@ -1,11 +1,5 @@ -AUX innoextract-1.4-cmake-3.5.patch 872 BLAKE2B 5c6bbfa095d065a5ef092b87b843714109022f9f0f54169be91dfeec91fec4f6f805625178409675141228b22155f4ad920ee61041a5b30d3ec58b93fd10af06 SHA512 e285d052c238baf66ea9e8b3236a1b4a4596c3376ff0e53ba417e9c629cec71256e56e9aa80b327208824939a25b567520384d3c437d493764431a41daabfc5f -AUX innoextract-1.4-cmake.patch 1027 BLAKE2B 81a0a8978b9ca0bb47148a6704829275b6a9112bf3ecbb1c2151c977e092352d7449a934a5d95c51c8b3b3ba5b392e6c828c83ae56a577b540c0d2c5e1991b88 SHA512 914af5af319165927e539996ea760737498547161a46a885c7f5e99c03bc0508d02fdac48b83f3591b3345fdba61b509e39998879802546a941aa2967a8a0d30 -DIST innoextract-1.4.tar.gz 151230 BLAKE2B 94c229bf4e28ca6433f9bd8cdfe23132ad84c67812540eeb950921de7389f7b565b4bea1853feb7732a9704f412b93886098b7a1b023021f06f5b22a220fb81a SHA512 60700ef05ff50e3409b92571ebfc7342c0eadc8add5d1262f7e7740e1a14cfd186a8a9ac0ecab85f01ae50f21edb48f49ba9428369131f7cd46c4b07214838ea -DIST innoextract-1.5.tar.gz 179582 BLAKE2B 41774ab38d9d774533ccb7d8a62757e91ff803e5f5e1ac115ba72081ebc31e6e8bf2e2dbf1b82ae20dd6adcca31f9d58d9ab1138fa7761a9cb877ae2c84249e0 SHA512 759c319c1f0737b9120ed4613bcab4bebcbb28749d9bbfa46ccb7b4f7640352b4ef01a03ed142c61f67188a83635d4e03e7b0708b913e1f47c09e5189bb56dd6 DIST innoextract-1.6.tar.gz 183380 BLAKE2B 581c0e28ececbabc8785f50472f312bc39c62d9174c1902645a961f06877c3e702ce0386aa611fe954c412997a1a69355e441cc33e243abd1828ff5e9d2ff8a2 SHA512 4c1b50a050d45e1a56d7236150a801cb85d15de8c80f5f1fd94750f3dd2392bdfb3f0e98c214e9504fe6132c7dce3a0dfbe0815ede438aa0f76a88380ceeef62 DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4 -EBUILD innoextract-1.4.ebuild 1757 BLAKE2B c06338ed2fa73dedfc4951b1a4d9bdbc79355607bcbb66c096031ea93213b9ad0b4b98044fd569a41ca5efe7fa75ee374cbed3ce6c04e04663aa807114a21ea7 SHA512 3ce6e89741ba21d99ae51b5af825f4792f75bff55bf3e44392ec1cf9ffb1e83e7c5a588efde0e87b7aff72e1d5e0b96fd4779da66884dd46f42288229e0dbc05 -EBUILD innoextract-1.5.ebuild 812 BLAKE2B 4d1d78f6410035084dff4ce7f998cd783555ff4424ef9378fc418b3cc44d0220c69ca2a983656146d2a22ba2ee613ba12b038a9bab2d6c629b8f410d4c795c29 SHA512 6ca3e1d8b725d9f67b49f7b9c7556052aff007a7dcd25219d161b87b017b74c11700a4c3761c240db679c8ae8d73d23aee786b128f2707e74a350b6c93b3d244 EBUILD innoextract-1.6.ebuild 749 BLAKE2B 4b959791b3ed667c0d017f209fd7b0e65d088ab7ca880e9aedc802a3e9cbe44a7b232823578578d540eb23a937a8f2c19465c1036154800d5fb5ac97db5328b2 SHA512 991a70217b350cd81ca3b026425ede051213c804f4032b4ea1b0fe3ad05e9273d705f7d55b3154fe856de2ff56f529e148ce7931215b80fac8299976aa7e37bb EBUILD innoextract-1.7.ebuild 733 BLAKE2B f118d601e3de781b5d0a7c881057366776bd62630bdc456c44e55e1537b7a59da58f0e50af6e2097bf99ec65065043308255fe69139d473ae1ad9dcc49c24b4d SHA512 6bad9d6afa092d21a3bc29e89adc6f81046103501e90e0a45999aa9339c59e770c89bb500096b4204bc15f0c84d29d5dc7b985c79fe37b49c6fb73f764afb724 -MISC metadata.xml 1001 BLAKE2B f353f5588ff40c34f0bc3a8a6eb4b11505aa677ce6a7198826d3acd8e98b07014aeec33c7de1fcc4a14434bcc6f2f4f53cefcbf9f5c52702bd0b689ee2efd4f4 SHA512 34d8f877efcbe9ef7a3515feac72984a9fc90770bd3ec170b0e8ecf38d42efb809c03f35a18d58de48b4fe09fb776f57e8336ef359e45942db903466de93185c +MISC metadata.xml 928 BLAKE2B 032de64587c2ab814a132d09f624a86f6b87a5fb1c49a1385969fcce89a7f75975480c8b3b70889621a97bb26e1d37240d51ef5a9da868983ee2467fc5c18f92 SHA512 0fb9ebc491eec20dbeee81d92ae7616464717c88684170ea064726b42120d65ac74edfac474e2605c191d91901e952859199c17bc84af3657812671cb3fb9260 diff --git a/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch b/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch deleted file mode 100644 index 0b619ac3810f..000000000000 --- a/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 01705758dd04d937160c99c8b87c6fa2057db894 Mon Sep 17 00:00:00 2001 -From: Daniel Scharrer -Date: Tue, 23 Feb 2016 05:45:50 +0100 -Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if() - -This makes the build system more rubust against stray variables -coming from included CMake scripts provided by the system. - -Fixes build with CMake 3.5 (tested with 3.5.0-rc3). - -Fixes: issue #50 ---- - CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02e0308..8653b93 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,6 +2,11 @@ project(innoextract) - - cmake_minimum_required(VERSION 2.8) - -+if(POLICY CMP0054) -+ # CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted. -+ cmake_policy(SET CMP0054 NEW) -+endif() -+ - - # Define configuration options - diff --git a/app-arch/innoextract/files/innoextract-1.4-cmake.patch b/app-arch/innoextract/files/innoextract-1.4-cmake.patch deleted file mode 100644 index 199a10e14fac..000000000000 --- a/app-arch/innoextract/files/innoextract-1.4-cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- innoextract-1.4/CMakeLists.txt -+++ innoextract-1.4/CMakeLists.txt -@@ -6,6 +6,7 @@ - # Define configuration options - - option(USE_LZMA "Build lzma decompression support." ON) -+option(WITH_DEBUG "Debug build" OFF) - option(DEBUG_EXTRA "Expensive debug options" OFF) - option(SET_WARNING_FLAGS "Adjust compiler warning flags" ON) - option(SET_OPTIMIZATION_FLAGS "Adjust compiler optimization flags" ON) ---- innoextract-1.4/cmake/BuildType.cmake -+++ innoextract-1.4/cmake/BuildType.cmake -@@ -8,7 +8,7 @@ - if(CMAKE_BUILD_TYPE STREQUAL "") - set(CMAKE_BUILD_TYPE "Release") - endif() --if(CMAKE_BUILD_TYPE STREQUAL "Debug") -+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR WITH_DEBUG) - add_definitions(-DDEBUG) - set(DEBUG 1) - endif() -@@ -64,7 +64,7 @@ - # Specifically, the need for libboost_system depends on the Boost version - add_ldflag("-Wl,--as-needed") - -- if(CMAKE_BUILD_TYPE STREQUAL "Debug") -+ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR WITH_DEBUG) - - # set debug symbol level to -g3 - check_compiler_flag(RESULT "-g3") diff --git a/app-arch/innoextract/innoextract-1.4.ebuild b/app-arch/innoextract/innoextract-1.4.ebuild deleted file mode 100644 index e4531fe7db0a..000000000000 --- a/app-arch/innoextract/innoextract-1.4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs cmake-utils - -DESCRIPTION="A tool to unpack installers created by Inno Setup" -HOMEPAGE="http://innoextract.constexpr.org/" -SRC_URI="mirror://github/dscharrer/InnoExtract/${P}.tar.gz - mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="c++0x debug doc +lzma static" - -RDEPEND=" - !static? ( - dev-libs/boost - virtual/libiconv - lzma? ( app-arch/xz-utils ) - )" -DEPEND="${RDEPEND} - doc? ( >=app-doc/doxygen-1.8.3.1 ) - static? ( - app-arch/bzip2[static-libs] - dev-libs/boost[static-libs] - sys-libs/zlib[static-libs] - virtual/libiconv - lzma? ( app-arch/xz-utils[static-libs] ) - )" - -DOCS=( README.md CHANGELOG ) - -PATCHES=( - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-cmake-3.5.patch -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # not sure about minimum clang req - if use c++0x && [[ $(tc-getCXX) == *g++ && $(tc-getCXX) != *clang++ ]] ; then - if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 || $(gcc-major-version) -lt 4 ]] ; then - eerror "You need at least sys-devel/gcc-4.7.0 for C++0x capabilities" - die "You need at least sys-devel/gcc-4.7.0 for C++0x capabilities" - fi - fi - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_use lzma LZMA) - $(cmake-utils_use_use static STATIC_LIBS) - $(cmake-utils_use_use c++0x CXX11) - $(cmake-utils_use_with debug DEBUG) - -DSET_OPTIMIZATION_FLAGS=OFF - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use doc && cmake-utils_src_compile doc -} - -src_install() { - cmake-utils_src_install - use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/* -} diff --git a/app-arch/innoextract/innoextract-1.5.ebuild b/app-arch/innoextract/innoextract-1.5.ebuild deleted file mode 100644 index 42b83011c099..000000000000 --- a/app-arch/innoextract/innoextract-1.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils 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 ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.4-cmake-3.5.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_use lzma LZMA) - $(cmake-utils_use debug DEBUG) - -DSET_OPTIMIZATION_FLAGS=OFF - -DSTRICT_USE=ON - -DWITH_CONV=$(usex iconv iconv builtin) - ) - - cmake-utils_src_configure -} diff --git a/app-arch/innoextract/metadata.xml b/app-arch/innoextract/metadata.xml index 65c171f5fd69..6d8f19bb3ddf 100644 --- a/app-arch/innoextract/metadata.xml +++ b/app-arch/innoextract/metadata.xml @@ -12,7 +12,6 @@ Enable debug logging and the --debug command-line option Enable support for extracting lzma-compressed installers using app-arch/xz-utils - Compile innoextract using the C++11 standard http://innoextract.constexpr.org/issues -- cgit v1.2.3