[gentoo-commits] repo/gentoo:master commit in: app-arch/innoextract/files/, app-arch/innoextract/

["Andreas Sturmlechner" <asturm@gentoo.org>]

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

 app-arch/innoextract/Manifest                      |  2 -
 .../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, 176 deletions(-)

diff --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
-}

diff --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>