[gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/, net-im/openmittsu/files/

2023-06-13 Thread Ulrich Müller 
commit: 7ab122518547e3a07ea354f7102df14f256fc942
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jun 13 09:47:16 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jun 13 09:48:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab12251

net-im/openmittsu: Fix compilation with MUSL libc

Closes: https://bugs.gentoo.org/907754
Signed-off-by: Ulrich Müller  gentoo.org>

 .../files/openmittsu-0.10.0.0-musl.patch   | 25 ++
 net-im/openmittsu/openmittsu-0.10.0.0.ebuild   |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch 
b/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch
new file mode 100644
index ..7935ff5530d4
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch
@@ -0,0 +1,25 @@
+Fix compilation with MUSL libc
+https://bugs.gentoo.org/907754
+
+Patch backported from spdlog repository:
+https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96
+
+commit 287a00d364990edbb621fe5e392aeb550135fb96
+Author: Khem Raj 
+Date:   Tue Jan 3 09:54:50 2023 -0800
+
+Do not use LFS64 functions on linux/musl (#2589)
+
+--- openmittsu-0.10.0.0/3rdparty/spdlog/include/spdlog/details/os-inl.h
 openmittsu-0.10.0.0/3rdparty/spdlog/include/spdlog/details/os-inl.h
+@@ -230,8 +230,8 @@
+ #else
+ int fd = ::fileno(f);
+ #endif
+-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
+-#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && 
(defined(__LP64__) || defined(_LP64))
++// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
++#if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || 
defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+ struct stat64 st;
+ if (::fstat64(fd, ) == 0)
+ {

diff --git a/net-im/openmittsu/openmittsu-0.10.0.0.ebuild 
b/net-im/openmittsu/openmittsu-0.10.0.0.ebuild
index 23de4770cacf..dc31c3a2ca06 100644
--- a/net-im/openmittsu/openmittsu-0.10.0.0.ebuild
+++ b/net-im/openmittsu/openmittsu-0.10.0.0.ebuild
@@ -29,6 +29,8 @@ RDEPEND="dev-db/qt5-sqlcipher
 DEPEND="${RDEPEND}
test? ( >=dev-cpp/gtest-1.8.0 )"
 
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
 DOCS=(
README.md
Example-client-configuration-file.ini

[gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/, net-im/openmittsu/files/

2017-06-03 Thread Ulrich Müller 
commit: 5a890dc01ae065a3f21d4724a61b478babddfcc7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jun  3 09:41:01 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jun  3 10:21:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a890dc0

net-im/openmittsu: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-im/openmittsu/Manifest |  2 +-
 net-im/openmittsu/files/openmittsu-cxx14.patch | 36 --
 9.2.106.ebuild => openmittsu-0.9.2.109.ebuild} |  2 --
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index 00610126317..71482fa0281 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1 +1 @@
-DIST openmittsu-0.9.2.106.tar.xz 1315056 SHA256 
759727ddeef09546015390c9fffbcbf71bb0f8b9039747d1fa537140ae6f40d5 SHA512 
7edd5ac21203f588de848aa712c3c8e588eb1122bb42a860ccc5a4f8c943ed2060b491913c64602f0be5ff3649c85bc6dd5c1c1b1837ad6872fe5f2cfc9bcaf8
 WHIRLPOOL 
acc38be4f13def1bb02c509d802ed8c06bae211c7e31a74c42e999af6d1977951c9d04af13a11c2c13a30c5412602539b025b0eafb5ce1a4162d91165df313a8
+DIST openmittsu-0.9.2.109.tar.xz 1314888 SHA256 
cf012e36ce157023082c8efa04ce6d4521ac16044334647c860a07b2ff94ea35 SHA512 
ad70ff7c3ceedcf1d6711468152199742533b8f42abbae5ce52f3e29882ae6aea566e8a39258a3d3676a91774e144a70d91967b31e4634f23d527f14325d0a5b
 WHIRLPOOL 
f0843eaa35507374a69977c0e023c060f47448d72ea77c3f640b2b5e1ddd87dff756c31c3827c043107af798b5abb58287b07dba8c841be57167d1e8787b1a24

diff --git a/net-im/openmittsu/files/openmittsu-cxx14.patch 
b/net-im/openmittsu/files/openmittsu-cxx14.patch
deleted file mode 100644
index e7de801e522..000
--- a/net-im/openmittsu/files/openmittsu-cxx14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3b7ce3b82deeaa7500b25cccee26384d8729 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ulrich=20M=C3=BCller?= 
-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.106.ebuild 
b/net-im/openmittsu/openmittsu-0.9.2.109.ebuild
similarity index 96%
rename from net-im/openmittsu/openmittsu-0.9.2.106.ebuild
rename to net-im/openmittsu/openmittsu-0.9.2.109.ebuild
index 14478f6de9a..04c452cf647 100644
--- a/net-im/openmittsu/openmittsu-0.9.2.106.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.2.109.ebuild
@@ -24,8 +24,6 @@ DEPEND=">=dev-libs/libsodium-1.0.11:=
>=media-gfx/qrencode-3.4.4-r1"
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}"/${PN}-cxx14.patch)
-
 DOCS=(
README.md
Example-client-configuration-file.ini

[gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/, net-im/openmittsu/files/

2017-04-24 Thread Ulrich Müller 
commit: 53b929fa6e8cad9c94cd8c3e684eeb510f25a29c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Apr 24 19:00:03 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Apr 24 19:01:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b929fa

net-im/openmittsu: Version bump.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-im/openmittsu/Manifest |  2 +-
 net-im/openmittsu/files/openmittsu-cxx14.patch | 36 ++
 9.2_p82.ebuild => openmittsu-0.9.2.106.ebuild} | 28 -
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index a9665a163c4..00610126317 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 000..e7de801e522
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-cxx14.patch
@@ -0,0 +1,36 @@
+From 3b7ce3b82deeaa7500b25cccee26384d8729 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= 
+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
similarity index 61%
rename from net-im/openmittsu/openmittsu-0.9.2_p82.ebuild
rename to net-im/openmittsu/openmittsu-0.9.2.106.ebuild
index af8cbc18f3c..14478f6de9a 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/-}-\")/" \
-   CMakeLists.txt || die
-   cmake-utils_src_prepare
-}
-
 src_configure() {
-   local mycmakeargs=("-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON")
+   local mycmakeargs=(
+   # set version

[gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/, net-im/openmittsu/files/

2017-02-22 Thread Ulrich Müller 
commit: fc3904f07b3bca43e2aa765e9d6b90fe6e120107
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Feb 22 12:13:12 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Feb 22 18:02:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3904f0

net-im/openmittsu: Remove old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-im/openmittsu/Manifest |  1 -
 .../files/openmittsu-0.9.2_p78-fmt.patch   | 49 
 net-im/openmittsu/openmittsu-0.9.2_p78.ebuild  | 54 --
 3 files changed, 104 deletions(-)

diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index c847b403d4..a9665a163c 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,2 +1 @@
-DIST openMittsu-0.9.2_p78.tar.xz 1304908 SHA256 
9be2d1e35a5995786f0c02383e0aaccd67f8848743417020f70d814f464ecc85 SHA512 
4969667bd7430dc5b7d0d756ae5f8f8f64ebd717645a6288a46f49f9b03930d6aceac3a9b3d507e12d0a35b69226e19ec65792af23e5e402cf6c7f693bae145c
 WHIRLPOOL 
4903f37a7ea9addc1739940138d50a6caf716810016900edc107b0f02538f10322040ef734e6159cd099347ac2a988bafc778c3c8a0accd26d3bace4a0930a2c
 DIST openMittsu-0.9.2_p82.tar.xz 1313600 SHA256 
3fefd9c9a67cede57e9f310c39d7547cd622a859511d5e7af12261d2fd4b337b SHA512 
c50e5618a282833d472c1d176d928dc2902d2d0a5e65bf4524af48ae17ba45e002fac5d3bceefaf8a4007eee3749976c680fd168c865c4b5e2e2e2c532d5f600
 WHIRLPOOL 
f3290289aa0f8a59c391f127561418a0103c00a664fff27db67c73125ba772f675e71db17fa7a3fa8a25c127527f66339e2d0cd4fa095d2746a13b9b905a6908

diff --git a/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch 
b/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch
deleted file mode 100644
index 19b55701e8..00
--- a/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/609366
-Backported from https://github.com/fmtlib/fmt.git:
-
-commit abbefd71666055daac9e14e78262620f9e845850
-Author: Victor Zverovich 
-Date:   Wed Oct 19 06:52:55 2016 -0700
-
-CHAR_WIDTH -> CHAR_SIZE to avoid collision with ISO/IEC TS 18661-1:2014 
macro
-
 openMittsu-0.9.2_p78-orig/3rdparty/spdlog/include/spdlog/details/format.h
-+++ openMittsu-0.9.2_p78/3rdparty/spdlog/include/spdlog/details/format.h
-@@ -2163,29 +2163,29 @@
- typedef typename BasicWriter::CharPtr CharPtr;
- Char fill = internal::CharTraits::cast(spec_.fill());
- CharPtr out = CharPtr();
--const unsigned CHAR_WIDTH = 1;
--if (spec_.width_ > CHAR_WIDTH)
-+const unsigned CHAR_SIZE = 1;
-+if (spec_.width_ > CHAR_SIZE)
- {
- out = writer_.grow_buffer(spec_.width_);
- if (spec_.align_ == ALIGN_RIGHT)
- {
--std::uninitialized_fill_n(out, spec_.width_ - CHAR_WIDTH, 
fill);
--out += spec_.width_ - CHAR_WIDTH;
-+std::uninitialized_fill_n(out, spec_.width_ - CHAR_SIZE, 
fill);
-+out += spec_.width_ - CHAR_SIZE;
- }
- else if (spec_.align_ == ALIGN_CENTER)
- {
- out = writer_.fill_padding(out, spec_.width_,
--   internal::check(CHAR_WIDTH), fill);
-+   internal::check(CHAR_SIZE), fill);
- }
- else
- {
--std::uninitialized_fill_n(out + CHAR_WIDTH,
--  spec_.width_ - CHAR_WIDTH, fill);
-+std::uninitialized_fill_n(out + CHAR_SIZE,
-+  spec_.width_ - CHAR_SIZE, fill);
- }
- }
- else
- {
--out = writer_.grow_buffer(CHAR_WIDTH);
-+out = writer_.grow_buffer(CHAR_SIZE);
- }
- *out = internal::CharTraits::cast(value);
- }

diff --git a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild 
b/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
deleted file mode 100644
index 3cbd7a1482..00
--- a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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;
-
-LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-libs/libsodium-1.0.11:=
-   >=dev-qt/qtcore-5.7.1:5=
-   >=dev-qt/qtgui-5.7.1:5=
-   >=dev-qt/qtmultimedia-5.7.1:5=
-   >=dev-qt/qtnetwork-5.7.1:5=
-   >=dev-qt/qtwidgets-5.7.1:5=
-

[gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/, net-im/openmittsu/files/

2017-02-11 Thread Ulrich Müller 
commit: efe4758dd340b6294362bde1c287b30b6286299f
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb 11 14:17:48 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb 11 14:21:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe4758d

net-im/openmittsu: Remove old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-im/openmittsu/Manifest |  1 -
 .../files/openmittsu-0.9.2_p75-libsodium-so.patch  | 11 -
 net-im/openmittsu/openmittsu-0.9.2_p75-r1.ebuild   | 55 --
 3 files changed, 67 deletions(-)

diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index d6753ad961..74fdc2efa2 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,2 +1 @@
-DIST openMittsu-0.9.2_p75.tar.xz 1304788 SHA256 
60366c341f6d2d638699649dfcaef97a734f2c367987d3849986321a515e24a3 SHA512 
d5ec9c942e771d51e86895c422e13893421d4a3b0adae9a9dac195f55c40064af2549bc41181b2abb2fe8b8dc0ffdf3c4c40b052e36f0eaf31fc98830b81c5f4
 WHIRLPOOL 
e8c0909e0a46009ef892930957bc1fb6763fbcd0c662f2b2c706482781161eeb3a5c26ee584c1d3a8f5bd1415d84f307bd0b1f707da4f787b4cf7e2e5ad160c6
 DIST openMittsu-0.9.2_p78.tar.xz 1304908 SHA256 
9be2d1e35a5995786f0c02383e0aaccd67f8848743417020f70d814f464ecc85 SHA512 
4969667bd7430dc5b7d0d756ae5f8f8f64ebd717645a6288a46f49f9b03930d6aceac3a9b3d507e12d0a35b69226e19ec65792af23e5e402cf6c7f693bae145c
 WHIRLPOOL 
4903f37a7ea9addc1739940138d50a6caf716810016900edc107b0f02538f10322040ef734e6159cd099347ac2a988bafc778c3c8a0accd26d3bace4a0930a2c

diff --git a/net-im/openmittsu/files/openmittsu-0.9.2_p75-libsodium-so.patch 
b/net-im/openmittsu/files/openmittsu-0.9.2_p75-libsodium-so.patch
deleted file mode 100644
index 3984b50688..00
--- a/net-im/openmittsu/files/openmittsu-0.9.2_p75-libsodium-so.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 openMittsu-orig/cmake/FindLibsodium.cmake
-+++ openMittsu/cmake/FindLibsodium.cmake
-@@ -31,7 +31,7 @@
-   ENDIF(MINGW)   
-   ELSE (UNIX)
-   SET (LIB_PREFIX "lib")
--  SET (LIB_POSTFIX "a")
-+  SET (LIB_POSTFIX "so")
-   ENDIF (WIN32)
-  
-   find_path(SODIUM_INCLUDE_DIR

diff --git a/net-im/openmittsu/openmittsu-0.9.2_p75-r1.ebuild 
b/net-im/openmittsu/openmittsu-0.9.2_p75-r1.ebuild
deleted file mode 100644
index da92298cee..00
--- a/net-im/openmittsu/openmittsu-0.9.2_p75-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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://github.com/blizzard4591/openMittsu;
-# 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;
-
-LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-libs/libsodium-1.0.11:=
-   >=dev-qt/qtcore-5.7.1:5=
-   >=dev-qt/qtgui-5.7.1:5=
-   >=dev-qt/qtmultimedia-5.7.1:5=
-   >=dev-qt/qtnetwork-5.7.1:5=
-   >=dev-qt/qtwidgets-5.7.1:5=
-   >=media-gfx/qrencode-3.4.4-r1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=(
-   README.md
-   Example-client-configuration-file.ini
-   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/-}-\")/" \
-   CMakeLists.txt || die
-
-   eapply "${FILESDIR}"/${P}-libsodium-so.patch
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=("-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON")
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   newicon resources/icon.png ${MY_PN}.png
-   make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}
-}

[gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/, net-im/openmittsu/files/

2017-01-29 Thread Ulrich Müller 
commit: 7caf5ff3b18c10249533784103f07f5500fa24bd
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jan 29 17:37:27 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jan 29 17:38:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7caf5ff3

net-im/openmittsu: Initial import.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-im/openmittsu/Manifest |  1 +
 .../files/openmittsu-0.9.2_p75-libsodium-so.patch  | 11 ++
 net-im/openmittsu/metadata.xml |  7 
 net-im/openmittsu/openmittsu-0.9.2_p75.ebuild  | 43 ++
 4 files changed, 62 insertions(+)

diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
new file mode 100644
index ..d70441f
--- /dev/null
+++ b/net-im/openmittsu/Manifest
@@ -0,0 +1 @@
+DIST openMittsu-0.9.2_p75.tar.xz 1304788 SHA256 
60366c341f6d2d638699649dfcaef97a734f2c367987d3849986321a515e24a3 SHA512 
d5ec9c942e771d51e86895c422e13893421d4a3b0adae9a9dac195f55c40064af2549bc41181b2abb2fe8b8dc0ffdf3c4c40b052e36f0eaf31fc98830b81c5f4
 WHIRLPOOL 
e8c0909e0a46009ef892930957bc1fb6763fbcd0c662f2b2c706482781161eeb3a5c26ee584c1d3a8f5bd1415d84f307bd0b1f707da4f787b4cf7e2e5ad160c6

diff --git a/net-im/openmittsu/files/openmittsu-0.9.2_p75-libsodium-so.patch 
b/net-im/openmittsu/files/openmittsu-0.9.2_p75-libsodium-so.patch
new file mode 100644
index ..3984b50
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.9.2_p75-libsodium-so.patch
@@ -0,0 +1,11 @@
+--- openMittsu-orig/cmake/FindLibsodium.cmake
 openMittsu/cmake/FindLibsodium.cmake
+@@ -31,7 +31,7 @@
+   ENDIF(MINGW)   
+   ELSE (UNIX)
+   SET (LIB_PREFIX "lib")
+-  SET (LIB_POSTFIX "a")
++  SET (LIB_POSTFIX "so")
+   ENDIF (WIN32)
+  
+   find_path(SODIUM_INCLUDE_DIR

diff --git a/net-im/openmittsu/metadata.xml b/net-im/openmittsu/metadata.xml
new file mode 100644
index ..c665e48
--- /dev/null
+++ b/net-im/openmittsu/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+  u...@gentoo.org
+
+

diff --git a/net-im/openmittsu/openmittsu-0.9.2_p75.ebuild 
b/net-im/openmittsu/openmittsu-0.9.2_p75.ebuild
new file mode 100644
index ..166cb7c
--- /dev/null
+++ b/net-im/openmittsu/openmittsu-0.9.2_p75.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P="openMittsu-${PV}"
+DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted 
chat networks"
+HOMEPAGE="https://github.com/blizzard4591/openMittsu;
+# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz;
+
+LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-libs/libsodium-1.0.11:=
+   >=dev-qt/qtcore-5.7.1:5=
+   >=dev-qt/qtgui-5.7.1:5=
+   >=dev-qt/qtmultimedia-5.7.1:5=
+   >=dev-qt/qtnetwork-5.7.1:5=
+   >=dev-qt/qtwidgets-5.7.1:5=
+   >=media-gfx/qrencode-3.4.4-r1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=("${FILESDIR}/${P}-libsodium-so.patch")
+MYCMAKEARGS="-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+
+DOCS="README.md
+   Example-client-configuration-file.ini
+   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/-}-\")/" \
+   CMakeLists.txt || die
+
+   default
+}