From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-arch/innoextract/Manifest | 11 ++++ .../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/innoextract-1.6.ebuild | 35 +++++++++++ app-arch/innoextract/metadata.xml | 25 ++++++++ 7 files changed, 244 insertions(+) create mode 100644 app-arch/innoextract/Manifest create mode 100644 app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch create mode 100644 app-arch/innoextract/files/innoextract-1.4-cmake.patch create mode 100644 app-arch/innoextract/innoextract-1.4.ebuild create mode 100644 app-arch/innoextract/innoextract-1.5.ebuild create mode 100644 app-arch/innoextract/innoextract-1.6.ebuild create mode 100644 app-arch/innoextract/metadata.xml (limited to 'app-arch/innoextract') diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest new file mode 100644 index 000000000000..60f63f730f76 --- /dev/null +++ b/app-arch/innoextract/Manifest @@ -0,0 +1,11 @@ +AUX innoextract-1.4-cmake-3.5.patch 872 SHA256 2fcc798ea3dce17edadf23bac3f0635e4d36c3758eefe0fa50b1f90642969c85 SHA512 e285d052c238baf66ea9e8b3236a1b4a4596c3376ff0e53ba417e9c629cec71256e56e9aa80b327208824939a25b567520384d3c437d493764431a41daabfc5f WHIRLPOOL d5f2118dd74a60fc38f9217715692b4eefc1b8edd5a4807bcb1c11b5b7066f2f6e7a73c1b6a5b1037d44bad24e6723e6850c562dd233cd58e3cc22e006d15c6c +AUX innoextract-1.4-cmake.patch 1027 SHA256 2066e6f4b34b7ac2febca22a48e6497b06ce774634ca93b07f95d8375936793a SHA512 914af5af319165927e539996ea760737498547161a46a885c7f5e99c03bc0508d02fdac48b83f3591b3345fdba61b509e39998879802546a941aa2967a8a0d30 WHIRLPOOL ff60b6b4efa18f6341941a86776aa6b0aa2ca847d6e0f7294e778f685611bf1093e1447129eb4314e7db15772bf8820b77c35d7037354b4da256b825259a5c10 +DIST innoextract-1.4.tar.gz 151230 SHA256 5a494b5ae1e41043574096761d31695ed8b1d39dfe64895306d0d92623901cc9 SHA512 60700ef05ff50e3409b92571ebfc7342c0eadc8add5d1262f7e7740e1a14cfd186a8a9ac0ecab85f01ae50f21edb48f49ba9428369131f7cd46c4b07214838ea WHIRLPOOL 26b38b5c8fbc5c1f79c3d2b3f9cabbe439140ee174d31926ee6c1507815417dbab02632f2aaaf8681c2755ba6907f0a67ef91f2672deab9b2bdef16e3bd323fa +DIST innoextract-1.5.tar.gz 179582 SHA256 f2594e992ccf2859455475794803b29a67393fadb69d4df1eec34c451ffa48cf SHA512 759c319c1f0737b9120ed4613bcab4bebcbb28749d9bbfa46ccb7b4f7640352b4ef01a03ed142c61f67188a83635d4e03e7b0708b913e1f47c09e5189bb56dd6 WHIRLPOOL d9601659b50836b69cdb74f287a4c8abfd489f47da619d8c95b6613b01f9ad85c53efa34b8fcdd1c3fe975325d351e1ea843dc3ce4b745ca8c383b6ff44b6489 +DIST innoextract-1.6.tar.gz 183380 SHA256 66463f145fffd4d5883c6b3e2f7b2c2837d6f07095810114e514233a88c1033e SHA512 4c1b50a050d45e1a56d7236150a801cb85d15de8c80f5f1fd94750f3dd2392bdfb3f0e98c214e9504fe6132c7dce3a0dfbe0815ede438aa0f76a88380ceeef62 WHIRLPOOL 5cf9a732d2754a09475576d7cc4c40dcf9406425afba02247f074f66719c4b79953869eaa206e9c082ac8476e9c7874acb208a082189e669cf38943ae233f8f5 +EBUILD innoextract-1.4.ebuild 1757 SHA256 772afc8148725ec8560ddba6842daae43a8e8fe036ee091636cc9f201313ef87 SHA512 3ce6e89741ba21d99ae51b5af825f4792f75bff55bf3e44392ec1cf9ffb1e83e7c5a588efde0e87b7aff72e1d5e0b96fd4779da66884dd46f42288229e0dbc05 WHIRLPOOL 5b34dfaafc6e8f338ac3c450970e654384f6c1b3899c35f36873d3e9a73011c8c239f09ab59e9b09423f88385bd1126aff86764bc1c5f34cb8a8eba2178d422b +EBUILD innoextract-1.5.ebuild 812 SHA256 14bcb74588c939be54fda024198bbf75e8f548ca33c0205a07eac0aa4a44e217 SHA512 6ca3e1d8b725d9f67b49f7b9c7556052aff007a7dcd25219d161b87b017b74c11700a4c3761c240db679c8ae8d73d23aee786b128f2707e74a350b6c93b3d244 WHIRLPOOL f00b60221e17a7db884b70922e9227935dd347b2072a1035ca562266c072c79dcad793fe8e8359a4fb335c376763502a59ac9abfdfd917232ccc5622e6ec46a7 +EBUILD innoextract-1.6.ebuild 751 SHA256 9d9043f56b682f271ee28808b11c2be163255f4c873af84a0d40376f6e602e5d SHA512 354b5f01e2b7dc8612ce06bc50be11962839994bb3e350e6739e59e1b10dbd02c477276c54cd432de64e54ed9ca582a12f1b9a4d51ec05ec239e3a5b25c13a7b WHIRLPOOL 4e648fe8afa63bf7b2fe2ae44177c42c86d9e36662ef606e947c6bc585e3c39d8b985108f9d93fb9a7a0fbda4254e3964cf83cea62ea07889fe05172ff7f33b7 +MISC ChangeLog 4918 SHA256 27b329b03e5eb44902fa662b283b75b0b4f80653e27056eef8faa51a9254ea9c SHA512 063286c7995dd0526fbde21259edb6691f376ed15bfee04ccbc271b61c3969ae8858cb4f8a2e6888be06e40690b61c235d973bd557353ae7d58c40d907865151 WHIRLPOOL 4dbfa2de2118d60a80b0f8eb644112648d78ac28a38deda04d40ae3b63b3b0565b8986f49e676a588a6df34207731b724264fcf0cbc5c4910eeb98827da43274 +MISC ChangeLog-2015 1572 SHA256 23d21fa4ba96f2342dfb62e2429ff5f38e9356d3ead34c007df1800a289f82fb SHA512 c323db54ee4544bf085da8b440d5ce909c5a3c0f49878ab6ad7266c2b0f3cba51bd857fe03d8e76500e85a53ea2403cf993ef2cb5f33e7db5a811717cce1e1a9 WHIRLPOOL e8f8c7dea36f6fbb4a0d66af37b3e7693713faa40e78a8fd98ba9d5ad1d86577788e81732c64be13b6a0984d5d593d376babe267e4bed7bd20fd1dbefa64cdc0 +MISC metadata.xml 1085 SHA256 0fdcea240c2fc67b7e44785922120552fc924000431b238633683a11150d2014 SHA512 70a1206093add6fdbb82f471bee22a0ffdb85da9c8558838e1a4488f72c4c6b2898f77f1b2e1b8c96a640c9e0fd1b49877e2bd8ca3c64ac420897753e76fde31 WHIRLPOOL 977fe6c84342b32d6ef2d643d23bed3ddcc26726af7e4e70da3086188ed92b998b7ccb644f81551d0e5c7bad0da114ffb70ecc750007d0515c9ed6fa9a87c59c 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 new file mode 100644 index 000000000000..0b619ac3810f --- /dev/null +++ b/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 000000000000..199a10e14fac --- /dev/null +++ b/app-arch/innoextract/files/innoextract-1.4-cmake.patch @@ -0,0 +1,30 @@ +--- 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 new file mode 100644 index 000000000000..e4531fe7db0a --- /dev/null +++ b/app-arch/innoextract/innoextract-1.4.ebuild @@ -0,0 +1,73 @@ +# 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 new file mode 100644 index 000000000000..42b83011c099 --- /dev/null +++ b/app-arch/innoextract/innoextract-1.5.ebuild @@ -0,0 +1,39 @@ +# 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/innoextract-1.6.ebuild b/app-arch/innoextract/innoextract-1.6.ebuild new file mode 100644 index 000000000000..518add0ed456 --- /dev/null +++ b/app-arch/innoextract/innoextract-1.6.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +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=( + $(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 new file mode 100644 index 000000000000..35f36acfcc7a --- /dev/null +++ b/app-arch/innoextract/metadata.xml @@ -0,0 +1,25 @@ + + + + + daniel@constexpr.org + Daniel Scharrer + Proxied maintainer; set to assignee in all bugs + + + proxy-maint@gentoo.org + Proxy Maintainers + + + 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 + http://constexpr.org/innoextract/changelog + http://constexpr.org/innoextract/innoextract.1 + dscharrer/innoextract + innoextract + + -- cgit v1.2.3