* [gentoo-commits] repo/gentoo:master commit in: app-arch/innoextract/files/, app-arch/innoextract/
@ 2015-08-14 23:10 Julian Ospald
0 siblings, 0 replies; 4+ messages in thread
From: Julian Ospald @ 2015-08-14 23:10 UTC (permalink / raw
To: gentoo-commits
commit: 00c7717bc25937246ba414a865f9fd87edba8265
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 23:01:21 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 23:01:21 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c7717b
app-arch/innoextract: rm old
| 2 -
| 49 ----------------------
| 49 ----------------------
| 37 ----------------
| 48 ---------------------
5 files changed, 185 deletions(-)
--git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index f0a1c9c..2df0067 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,3 +1 @@
-DIST innoextract-1.2.tar.gz 106162 SHA256 a56b11bab2e209c7b37a93b3bd7416eb7359824071fc3ae1cf16a8421747cb9a SHA512 8e7fa55b1ed97ba8cc3f031904c29415c5e2f226f7963e439380bca287f4f034d2491a8d5c79e61a714d26e6e6b0997cc191ac7960ed564c69de58a92d47aced WHIRLPOOL d409057f8a90b6485c92be3b45f24cc8af1bd27dcd98df8c7ce97735c05a26556e5b62a795c0b61c64bcbc7674d205b6eabf1f995b64836dfd2e3d9d74c7f889
-DIST innoextract-1.3.tar.gz 130613 SHA256 bee65d1df2223870acb91ab90e9d933157167b8f7f5691ddd70f6a041d5bf671 SHA512 4faa263db00b847cf97b105696c49028fe80558b228ed840250be8abae9bfd0627488768eaa961fbe3a0c056d2e42487408ff3abc5b50bdf65b6bcb288721f66 WHIRLPOOL 47acd475ec776e4318a2f9a52dd57fc90106c2097180cbd6b8f962610ad486320896a6a58024c8625b5a3f6687d6444c1cd0eebdb47de5a6b261fa33031c2569
DIST innoextract-1.4.tar.gz 151230 SHA256 5a494b5ae1e41043574096761d31695ed8b1d39dfe64895306d0d92623901cc9 SHA512 60700ef05ff50e3409b92571ebfc7342c0eadc8add5d1262f7e7740e1a14cfd186a8a9ac0ecab85f01ae50f21edb48f49ba9428369131f7cd46c4b07214838ea WHIRLPOOL 26b38b5c8fbc5c1f79c3d2b3f9cabbe439140ee174d31926ee6c1507815417dbab02632f2aaaf8681c2755ba6907f0a67ef91f2672deab9b2bdef16e3bd323fa
diff --git a/app-arch/innoextract/files/innoextract-1.2-gentoo.patch b/app-arch/innoextract/files/innoextract-1.2-gentoo.patch
deleted file mode 100644
index 756f089..0000000
--- a/app-arch/innoextract/files/innoextract-1.2-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Jun 27 23:41:12 UTC 2012
-Subject: build system
-
-respect flags
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -54,40 +54,13 @@
- link_directories("${Boost_LIBRARY_DIRS}")
- include_directories(SYSTEM "${Boost_INCLUDE_DIR}")
-
--add_cxxflag("-Wall")
--add_cxxflag("-Wextra")
--add_cxxflag("-Wformat=2")
--add_cxxflag("-Wundef")
--add_cxxflag("-Wpointer-arith")
--add_cxxflag("-Wcast-qual")
--add_cxxflag("-Woverloaded-virtual")
--add_cxxflag("-Wlogical-op")
--add_cxxflag("-Wliteral-conversion")
--add_cxxflag("-Wshift-overflow")
--add_cxxflag("-Woverflow")
--add_cxxflag("-Wbool-conversions")
--add_cxxflag("-Wconversion")
--add_cxxflag("-Wsign-conversion")
--add_cxxflag("-Wmissing-declarations")
--add_cxxflag("-Wredundant-decls")
--
- if(DEBUG_EXTRA)
- add_cxxflag("-ftrapv") # to add checks for (undefined) signed integer overflow
- add_cxxflag("-fbounds-checking")
- add_cxxflag("-fcatch-undefined-behavior")
- add_cxxflag("-Wstrict-aliasing=1")
--else()
-- # -Wuninitialized causes too many false positives - thanks very much, gcc
-- add_cxxflag("-Wno-uninitialized")
-- # (clang only) Conflicts with using const variables for configuration.
-- add_cxxflag("-Wno-constant-logical-operand")
-- add_cxxflag("-Wno-unneeded-internal-declaration")
-- add_cxxflag("-Wno-unused-function")
- endif()
-
--# Because i'm lazy
--add_cxxflag("-Wl,--as-needed")
--
- check_symbol_exists(isatty "unistd.h" HAVE_ISATTY)
- check_symbol_exists(ioctl "sys/ioctl.h" HAVE_IOCTL)
-
diff --git a/app-arch/innoextract/files/innoextract-1.3-gentoo.patch b/app-arch/innoextract/files/innoextract-1.3-gentoo.patch
deleted file mode 100644
index 31f7e90..0000000
--- a/app-arch/innoextract/files/innoextract-1.3-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Jul 3 18:00:33 UTC 2012
-Subject: build system
-
-respect flags
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -57,40 +57,13 @@
-
- add_cxxflag("-std=c++11")
-
--add_cxxflag("-Wall")
--add_cxxflag("-Wextra")
--add_cxxflag("-Wformat=2")
--add_cxxflag("-Wundef")
--add_cxxflag("-Wpointer-arith")
--add_cxxflag("-Wcast-qual")
--add_cxxflag("-Woverloaded-virtual")
--add_cxxflag("-Wlogical-op")
--add_cxxflag("-Wliteral-conversion")
--add_cxxflag("-Wshift-overflow")
--add_cxxflag("-Woverflow")
--add_cxxflag("-Wbool-conversions")
--add_cxxflag("-Wconversion")
--add_cxxflag("-Wsign-conversion")
--add_cxxflag("-Wmissing-declarations")
--add_cxxflag("-Wredundant-decls")
--
- if(DEBUG_EXTRA)
- add_cxxflag("-ftrapv") # to add checks for (undefined) signed integer overflow
- add_cxxflag("-fbounds-checking")
- add_cxxflag("-fcatch-undefined-behavior")
- add_cxxflag("-Wstrict-aliasing=1")
--else()
-- # -Wuninitialized causes too many false positives - thanks very much, gcc
-- add_cxxflag("-Wno-uninitialized")
-- # (clang only) Conflicts with using const variables for configuration.
-- add_cxxflag("-Wno-constant-logical-operand")
-- add_cxxflag("-Wno-unneeded-internal-declaration")
-- add_cxxflag("-Wno-unused-function")
- endif()
-
--# Because i'm lazy
--add_ldflag("-Wl,--as-needed")
--
- check_symbol_exists(isatty "unistd.h" HAVE_ISATTY)
- check_symbol_exists(ioctl "sys/ioctl.h" HAVE_IOCTL)
-
diff --git a/app-arch/innoextract/innoextract-1.2.ebuild b/app-arch/innoextract/innoextract-1.2.ebuild
deleted file mode 100644
index 92b28ea..0000000
--- a/app-arch/innoextract/innoextract-1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2012-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit 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="debug +lzma"
-
-DEPEND=">=dev-libs/boost-1.37
- lzma? ( app-arch/xz-utils )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md CHANGELOG )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_configure() {
- use debug && CMAKE_BUILD_TYPE=Debug
-
- local mycmakeargs=(
- $(cmake-utils_use lzma USE_LZMA)
- )
-
- cmake-utils_src_configure
-}
diff --git a/app-arch/innoextract/innoextract-1.3.ebuild b/app-arch/innoextract/innoextract-1.3.ebuild
deleted file mode 100644
index 5cb382c..0000000
--- a/app-arch/innoextract/innoextract-1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit 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="debug doc +lzma"
-
-RDEPEND=">=dev-libs/boost-1.37
- lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-DOCS=( README.md CHANGELOG )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_configure() {
- use debug && CMAKE_BUILD_TYPE=Debug
-
- local mycmakeargs=(
- $(cmake-utils_use lzma USE_LZMA)
- )
-
- 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/*
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/innoextract/files/, app-arch/innoextract/
@ 2016-03-10 23:09 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-03-10 23:09 UTC (permalink / raw
To: gentoo-commits
commit: 63d58d65a60eb97413d606875549f46c9e3a3a74
Author: Daniel Scharrer <daniel <AT> constexpr <DOT> org>
AuthorDate: Thu Mar 10 15:46:55 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 22:56:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d58d65
app-arch/innoextract: fix build with cmake 3.5
Closes: https://github.com/gentoo/gentoo/pull/1025
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
| 31 ++++++++++++++++++++++
| 2 ++
| 7 ++++-
3 files changed, 39 insertions(+), 1 deletion(-)
--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 0000000..0b619ac
--- /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 <daniel@constexpr.org>
+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
+
--git a/app-arch/innoextract/innoextract-1.4.ebuild b/app-arch/innoextract/innoextract-1.4.ebuild
index 37b9d2f..1fb858e 100644
--- a/app-arch/innoextract/innoextract-1.4.ebuild
+++ b/app-arch/innoextract/innoextract-1.4.ebuild
@@ -48,6 +48,8 @@ pkg_pretend() {
src_prepare() {
epatch "${FILESDIR}"/${P}-cmake.patch
+ epatch "${FILESDIR}"/${P}-cmake-3.5.patch
+ cmake-utils_src_prepare
}
src_configure() {
--git a/app-arch/innoextract/innoextract-1.5.ebuild b/app-arch/innoextract/innoextract-1.5.ebuild
index de64200..eedb4ed 100644
--- a/app-arch/innoextract/innoextract-1.5.ebuild
+++ b/app-arch/innoextract/innoextract-1.5.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit cmake-utils
+inherit eutils cmake-utils
DESCRIPTION="A tool to unpack installers created by Inno Setup"
HOMEPAGE="http://constexpr.org/innoextract/"
@@ -23,6 +23,11 @@ DEPEND="${RDEPEND}"
DOCS=( README.md CHANGELOG )
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.4-cmake-3.5.patch
+ cmake-utils_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_use lzma LZMA)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/innoextract/files/, app-arch/innoextract/
@ 2018-07-07 22:44 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-07-07 22:44 UTC (permalink / raw
To: gentoo-commits
commit: 0051bf5a72a19e1f449cb79ca525014a81d8209b
Author: Daniel Scharrer <daniel <AT> constexpr <DOT> org>
AuthorDate: Sat Jul 7 18:13:59 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 7 22:44:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0051bf5a
app-arch/innoextract: Drop old
Closes: https://github.com/gentoo/gentoo/pull/9091
| 2 -
| 31 ---------
| 30 ---------
| 73 ----------------------
| 39 ------------
| 1 -
6 files changed, 176 deletions(-)
--git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index b2939907e54..20c9a908547 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,4 +1,2 @@
-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
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 0b619ac3810..00000000000
--- 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 <daniel@constexpr.org>
-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 199a10e14fa..00000000000
--- 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 e4531fe7db0..00000000000
--- 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 42b83011c09..00000000000
--- 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
-}
--git a/app-arch/innoextract/metadata.xml b/app-arch/innoextract/metadata.xml
index 65c171f5fd6..6d8f19bb3dd 100644
--- a/app-arch/innoextract/metadata.xml
+++ b/app-arch/innoextract/metadata.xml
@@ -12,7 +12,6 @@
<use>
<flag name="debug">Enable debug logging and the --debug command-line option</flag>
<flag name="lzma">Enable support for extracting lzma-compressed installers using <pkg>app-arch/xz-utils</pkg></flag>
- <flag name="c++0x">Compile innoextract using the C++11 standard</flag>
</use>
<upstream>
<bugs-to>http://innoextract.constexpr.org/issues</bugs-to>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/innoextract/files/, app-arch/innoextract/
@ 2020-11-20 14:48 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2020-11-20 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 7320f67eb4dbc13d3f123a99948b9d2d02ad0a63
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 14:47:51 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 14:47:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7320f67e
app-arch/innoextract: bump to 1.9
Bug: https://bugs.gentoo.org/738742
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 +
| 17 ++++++++++
| 37 ++++++++++++++++++++++
3 files changed, 55 insertions(+)
--git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index 149c2f7dd31..571b0bdaa20 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,2 +1,3 @@
DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4
DIST innoextract-1.8.tar.gz 205553 BLAKE2B 223f0997ae00f2a854912befca25595b275ece8e0fe4f4451d6aa3db14ad1ed98474a19c919c56d958e99c0175be647d3eb3c14d7869504405a7bf6db3a35957 SHA512 2c68009333f02a8a677c084e9c95c835d84a73e60c9b0c70fee5f23fd9a7a640cf2aa7e0476c55579774ac7079498fa24668f9388493bbc13415ff5a5b06ac9c
+DIST innoextract-1.9.tar.gz 206931 BLAKE2B 1d5f0d13a7cd52262b277263f061ecab85a3419197bceb22938a0d10000578603cc2c2b972a45474027cfea8e43b8bf89d680035034785210842477b147811fa SHA512 2b18f7bb7f50744bcb1bdcd25e57e0760193b179c77b55e0f63c537e55afc98de3b0380da3cae470ce97660ed41a7ffbb48c8c25329c9ce9b3811d9aec74bcde
--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 00000000000..79ecd805f49
--- /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
--git a/app-arch/innoextract/innoextract-1.9.ebuild b/app-arch/innoextract/innoextract-1.9.ebuild
new file mode 100644
index 00000000000..4067b8b4a68
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A tool to unpack installers created by Inno Setup"
+HOMEPAGE="https://constexpr.org/innoextract/"
+SRC_URI="https://constexpr.org/innoextract/files/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug +iconv +lzma"
+
+RDEPEND="
+ 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)
+ -DSET_OPTIMIZATION_FLAGS=OFF
+ -DSTRICT_USE=ON
+ -DUSE_LZMA=$(usex lzma)
+ -DWITH_CONV=$(usex iconv iconv builtin)
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-20 14:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-10 23:09 [gentoo-commits] repo/gentoo:master commit in: app-arch/innoextract/files/, app-arch/innoextract/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2020-11-20 14:48 Sam James
2018-07-07 22:44 Andreas Sturmlechner
2015-08-14 23:10 Julian Ospald
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox