net-im/openmittsu: Version bump.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

3 files changed, 50 insertions, 16 deletions

diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index a9665a163c40..006101263176 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1 +1 @@
-DIST openMittsu-0.9.2_p82.tar.xz 1313600 SHA256 3fefd9c9a67cede57e9f310c39d7547cd622a859511d5e7af12261d2fd4b337b SHA512 c50e5618a282833d472c1d176d928dc2902d2d0a5e65bf4524af48ae17ba45e002fac5d3bceefaf8a4007eee3749976c680fd168c865c4b5e2e2e2c532d5f600 WHIRLPOOL f3290289aa0f8a59c391f127561418a0103c00a664fff27db67c73125ba772f675e71db17fa7a3fa8a25c127527f66339e2d0cd4fa095d2746a13b9b905a6908
+DIST openmittsu-0.9.2.106.tar.xz 1315056 SHA256 759727ddeef09546015390c9fffbcbf71bb0f8b9039747d1fa537140ae6f40d5 SHA512 7edd5ac21203f588de848aa712c3c8e588eb1122bb42a860ccc5a4f8c943ed2060b491913c64602f0be5ff3649c85bc6dd5c1c1b1837ad6872fe5f2cfc9bcaf8 WHIRLPOOL acc38be4f13def1bb02c509d802ed8c06bae211c7e31a74c42e999af6d1977951c9d04af13a11c2c13a30c5412602539b025b0eafb5ce1a4162d91165df313a8
diff --git a/net-im/openmittsu/files/openmittsu-cxx14.patch b/net-im/openmittsu/files/openmittsu-cxx14.patch
new file mode 100644
index 000000000000..e7de801e522d
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-cxx14.patch
@@ -0,0 +1,36 @@
+From 3b7ce3b82deeaa7500b25cccee263845555d8729 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
+Date: Mon, 24 Apr 2017 20:48:08 +0200
+Subject: [PATCH] Set C++ standard to 14.
+
+Needed for CMake 3.1.0 or later, which would otherwise fall back
+to -std=gnu++11 in flags.make.
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aef2b89..401f636 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -85,6 +85,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
+     # Set standard flags for GCC
+     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -pedantic")
++    set(CMAKE_CXX_STANDARD 14)
++    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ elseif(MSVC)
+     set(OPENMITTSU_COMPILED_BY "MSVC")
+ 	
+@@ -112,6 +114,8 @@ else(CLANG)
+ 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+     endif()
+     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=${CLANG_STDLIB} -Wall -pedantic -Wno-unused-variable -ftemplate-depth=1024")
++    set(CMAKE_CXX_STANDARD 14)
++    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ endif()
+ 
+ #
+-- 
+2.12.2
+
diff --git a/net-im/openmittsu/openmittsu-0.9.2_p82.ebuild b/net-im/openmittsu/openmittsu-0.9.2.106.ebuild
index af8cbc18f3ce..14478f6de9ab 100644
--- a/net-im/openmittsu/openmittsu-0.9.2_p82.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.2.106.ebuild
@@ -5,11 +5,10 @@ EAPI=6
 
 inherit cmake-utils eutils
 
-MY_PN="openMittsu"
 DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
 HOMEPAGE="https://www.openmittsu.de/"
-# git-archive-all.sh snapshot of https://github.com/blizzard4591/${MY_PN}.git
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${MY_PN}-${PV}.tar.xz"
+# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0"
 SLOT="0"
@@ -20,11 +19,12 @@ DEPEND=">=dev-libs/libsodium-1.0.11:=
 	>=dev-qt/qtgui-5.7.1:5=
 	>=dev-qt/qtmultimedia-5.7.1:5=
 	>=dev-qt/qtnetwork-5.7.1:5=
+	>=dev-qt/qtsql-5.7.1:5=[sqlite]
 	>=dev-qt/qtwidgets-5.7.1:5=
 	>=media-gfx/qrencode-3.4.4-r1"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+PATCHES=("${FILESDIR}"/${PN}-cxx14.patch)
 
 DOCS=(
 	README.md
@@ -32,21 +32,19 @@ DOCS=(
 	Example-contacts-file.txt
 )
 
-src_prepare() {
-	# set version manually, since autodetection works only with git
-	sed -i "/git_describe_checkout/\
-		s/.*/set(OPENMITTSU_GIT_VERSION_STRING \"${PV/_p/-}-00000000\")/" \
-		CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
 src_configure() {
-	local mycmakeargs=("-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON")
+	local mycmakeargs=(
+		# set version manually, since autodetection works only with git
+		"-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
+		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+	)
 	cmake-utils_src_configure
 }
 
 src_install() {
+	local my_pn="openMittsu"
 	cmake-utils_src_install
-	newicon resources/icon.png ${MY_PN}.png
-	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}
+	newicon resources/icon.png ${my_pn}.png
+	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
+	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
 }