version bump

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 127 insertions, 12 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/Manifest b/app-arch/innoextract/Manifest
index 070d2771ab90..d72e0a692a43 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX innoextract-1.2-gentoo.patch 1479 SHA256 18f075a5d460e179641c2cbc419e95b2ca4d7fc384213974b53a5a3f6a44f556 SHA512 aeffec6616097fc7d35bf7cffa9075016284891a0af74a4161efe4a1a2fafa43f5957bb7723bae1e47613f1d55f06aaa5d7d260ee22300a801ccfbcdf5b93de0 WHIRLPOOL cd777b3d7aa39ffd06593ceba02e743240b97cb43d17f3f3c56c322e3a6a08599e1457fb737cd638c540af41b799a3fc7141c6925e8d067cd56d68b8543c8c9d
 AUX innoextract-1.3-gentoo.patch 1412 SHA256 693980a1a4f42ec5e910808c7f0b9823fdd54777119339193c919aa97152cb11 SHA512 83f26cd84960be0561be7531ede8f85b8372f1d7fc0186b24e59f92f453321466d4ce735af92137cfb87f9f49a287f84f45ea8fbe7567e90577bd9b04ea7180b WHIRLPOOL 4c1146c643689b48fbeb2346f74de5ffe7815b0b2e64a6376bb57dfa233ea568833803e5f09d6aa79533626278135c4e7db5fb6945dc28b566df55aa8cbf0c09
+AUX innoextract-1.4-cmake.patch 1027 SHA256 2066e6f4b34b7ac2febca22a48e6497b06ce774634ca93b07f95d8375936793a SHA512 914af5af319165927e539996ea760737498547161a46a885c7f5e99c03bc0508d02fdac48b83f3591b3345fdba61b509e39998879802546a941aa2967a8a0d30 WHIRLPOOL ff60b6b4efa18f6341941a86776aa6b0aa2ca847d6e0f7294e778f685611bf1093e1447129eb4314e7db15772bf8820b77c35d7037354b4da256b825259a5c10
 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
 EBUILD innoextract-1.2.ebuild 849 SHA256 df571e7cf0c0ad24e9b91c25292b9ba258deca000849ec32f03165af2dbe7440 SHA512 755cb542882e955a9965c32a36b68fa15110db8569e75b879a818b5793915bd953a4a969dcf0add75d68804fe070022334c2a7bbc2137a817a048172f016d474 WHIRLPOOL eee5cf82deae7eefe0f15e835f4b8a96d43cc68e3c4da8a3983a33e38f3a56f63502ee437465818dd22190d5a7ad4a0d3115e70c1f240876ff41cfc94298ad0d
 EBUILD innoextract-1.3.ebuild 1055 SHA256 85b341371e66097e4a22e4f5a383e9e02e6795f5d949bfca01d2bfc51aeec9cd SHA512 34beff3f1ff16d6f9c6679dbb160d6cf42fa301e44c79ab19bb0c4c636ec3c4cb96f1b0ce82be178033aeb4d8852488eaf49f980f8c2b92348e1cb36fb88666d WHIRLPOOL cde72a99931d743c0186f5ac43ca30e77444e82bc59c4a664014fc61b3ab3ffec48f7eeef9d550d774b57538366b5e3b1df6d3f9af9d950888ffb4a0dfcc29bf
-MISC ChangeLog 854 SHA256 ead8ac1251728d41c2c5dc51acb445a08d0ce7cb43c6b0293d374e09b8cb429a SHA512 71b4765cee83bbfcad47795bc20304fedf951532cac11f5ceec49d089d1fe7b7c152f2a8ebce7dffdd122ac1fc55a7191d9d6c0395b634ce17d96f30e2444b13 WHIRLPOOL f7f551f0602ceeb757b717b8d14911d1bea14590857a68e98cb8481d92df0ecf1a80c3ad108b0f28cd56aac29ebc8f2c0d6bdd28045a9f1f53c2f69b53e4ab44
-MISC metadata.xml 455 SHA256 da950886cb7f3452628ffc450ed6153c078ceac4a4cab2e2a3574928b4c8d447 SHA512 68be12515ac4d3b1933d31ea9c791bb1be597b7fd78f2f2dacc492ad862f0e91d25195ec0f82b96903bd8886c9444e82b15f026ab2715a872ad8f9cf84ab0686 WHIRLPOOL 4c3da84470de38a59b28c3e97bddebc4e92f2b297bb2b4d87db13676df3841f81d362fb3eae4fe5a40782649dc7f71dc361424378600fede5d3a2cd8d72ef88e
+EBUILD innoextract-1.4.ebuild 1856 SHA256 6ddce05ed7fa77244c275d4a1e22fd5797796f80b523621e204edff8e086e7dc SHA512 ac3b538206c7289772c3ee28e206f472d435012b5489fd3064be9b0c2e665e82af52226cf910c7f99b5bd8ae949669c01e8237b28a0b18dd9e8475d1e2f01c9c WHIRLPOOL 3dde611de5de91b51893f312a9e797c62b56521ced6fb51ebfd2cc6ced04dc07600284a351125c5557767cef538849ca93b4c287b76527cbfdef5c35fb235354
+MISC ChangeLog 1035 SHA256 0150dabdd2f8dcec4a525713e2b9c84437f3ff5cdfb4321aabe13237d262c506 SHA512 55d3cd121ef413c6021918cf0050dc27090d7512dd5995273f2b3051c4e6ad7cce0ea9e38b589b8c60334cc89e44e98adb923d0f5f9fdf22ff933d00d10c6c38 WHIRLPOOL 0ee53027ab1e5875a6094621297fa7fa19059614a909c22bc5ffbf865b6fb4b8244426bbbd71157ccaa15b46f69a5b249f2239ee23011e6b458bb601adf36ba5
+MISC metadata.xml 535 SHA256 444b4ea08ccd1d0ea0b99e16263237eca2c2000ef2ba11e3bbf5213adf7dc011 SHA512 31963d7edcf03840ca9484db77b3ec7ad7191129bf3ea99257f53f9cc80ea83704ca7cbc6922279cc6e659ddf1328340edebdc3d8755b3023445259309492d94 WHIRLPOOL ed74e0f4ea3a1cd9cdfab3e61dec9310bb6268f13715346025a1c1f995d703d02dcbbbd1310bd2a185e198fecc1d49932ee9debb737c47203db115e240248d37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQG9DuAAoJEOTDgjZ80txdWzUIAKAZS47gYM3IN9/uKCKPy/v5
-aYv6+aeSR/cjYAPV18HFzrKIdC0uLyyhuKLb67MfKgnd7DGcUrLq6BZ2+5PZWoze
-jU8zc7xOiBebtOizxARLkdr2boHFTmej6jW1pBs4sVM7dA3TqmXBdNa3h1oQD8I8
-PJn40bz8mfKP4q2oTeOWF97yxict/vjOf0G6WhukudHLnun1WCyNYFMmQrX0shXF
-qcv1YISb1fNhFWRm5nuYUBFsySUU4EEAAb46bd0/3K3k3I1CfazVO2A6wQdAQKDy
-52lOTyMaqFnrDP0/zAyaQ8thQg9cdUe9pj149PixLNPalFtnXXF4ayBpWhNvnrU=
-=uktR
+iQEcBAEBCAAGBQJRPiyTAAoJEFpvPKfnPDWzhS0H/ief4+PtSFtj9xR4kEKTm/7o
+7XvMAzWKA3bVzAy+ue2Icxuze+aJ8/VlsOtcP/q4e/vXhvI82ynns1hege7h/FlS
+WUGU1NRsv61YrUZg2j7Vl5r8oCyP4n8wftuTuruDAnbo7B5lnnnetXeFdaCdrwBu
+WSJAH4kxGuKylpwdTNQqaPC7QhNw3jELlcxl69DHO3FgcPuwj3hq2eowdkO7l6tR
+3cgLiFQuvu9v00sU7Z7FpLPnVHg+pqyeYO03XVOiDr0ZwFPj6yFN+L75bBptdpPR
+OHL+fxkDz2q1HsmE3GHJU5LSGyHsaMwNwEwFlweO9+avDsKOXgQ+Pl1rALx9WKM=
+=IK1Q
 -----END PGP SIGNATURE-----
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>