version bump

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 114 insertions, 2 deletions

diff --git a/app-arch/innoextract/ChangeLog b/app-arch/innoextract/ChangeLog
index 46a795b74c84..d96db9350b0c 100644
--- a/app-arch/innoextract/ChangeLog
+++ b/app-arch/innoextract/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/innoextract
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/innoextract/ChangeLog,v 1.5 2012/08/03 13:23:52 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/innoextract/ChangeLog,v 1.6 2013/03/11 19:12:15 hasufell Exp $
+
+*innoextract-1.4 (11 Mar 2013)
+
+  11 Mar 2013; Julian Ospald <hasufell@gentoo.org> +innoextract-1.4.ebuild,
+  +files/innoextract-1.4-cmake.patch, metadata.xml:
+  version bump
 
   03 Aug 2012; Agostino Sarubbo <ago@gentoo.org> innoextract-1.3.ebuild:
   Stable for amd64, wrt bug #428224
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..ae0cc2727961
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2013-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/innoextract/innoextract-1.4.ebuild,v 1.1 2013/03/11 19:12:15 hasufell Exp $
+
+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 )
+
+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_prepare() {
+	epatch "${FILESDIR}"/${P}-cmake.patch
+}
+
+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/metadata.xml b/app-arch/innoextract/metadata.xml
index aae512b5d529..37633fb17d8a 100644
--- a/app-arch/innoextract/metadata.xml
+++ b/app-arch/innoextract/metadata.xml
@@ -11,5 +11,8 @@
 		<name>Daniel Scharrer</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<use>
+		<flag name='c++0x'>Build ROOT using the C++11 standard.</flag>
+	</use>
 </pkgmetadata>