1 |
commit: 19982608ac700e43d912f4f555dddff7013d40bf |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 20 16:25:08 2017 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 20 16:25:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19982608 |
7 |
|
8 |
media-gfx/nomacs: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
media-gfx/nomacs/Manifest | 1 - |
13 |
media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch | 11 ---- |
14 |
media-gfx/nomacs/nomacs-3.4-r1.ebuild | 75 ----------------------- |
15 |
3 files changed, 87 deletions(-) |
16 |
|
17 |
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest |
18 |
index 16f42432eca..c9eb6c47348 100644 |
19 |
--- a/media-gfx/nomacs/Manifest |
20 |
+++ b/media-gfx/nomacs/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST nomacs-3.4.tar.gz 30026261 SHA256 552eda88aedea48831ce354095e3aad47892b4b5029f424171bedb68271c2a2f SHA512 67a1b57971dc373d5a3be75b7deaff6702893252568eef135903754b2465416a58b40f18f55cf2994c8c3853ae96b82506c1caf26b0e645c20179a9cd81c0d36 WHIRLPOOL f082d568ba56eaa1effc5e8552d16b816d558b7d4c2d7ddfd14a39f8805490d772116ca6ee35c8a38bd6b5fc69917287b7c596986f6a15b854bfebcbbe14304f |
23 |
DIST nomacs-3.6.1.tar.gz 28604636 SHA256 09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e WHIRLPOOL 34125377dee0977ed6e48008d4d8e3ff461c39ab72e89c4dc3c3e8dd0eb0544da91db5a1cd1b38b1bad119a539a60664fd91cea90b21140042db06601d00604b |
24 |
|
25 |
diff --git a/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch b/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch |
26 |
deleted file mode 100644 |
27 |
index 698b45c6ace..00000000000 |
28 |
--- a/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch |
29 |
+++ /dev/null |
30 |
@@ -1,11 +0,0 @@ |
31 |
---- a/src/DkLoader/DkBasicLoader.h |
32 |
-+++ b/src/DkLoader/DkBasicLoader.h |
33 |
-@@ -258,7 +258,7 @@ class DllLoaderExport DkBasicLoader : public QObject { |
34 |
- bool readHeader(const unsigned char** dataPtr, int& fileCount, int& vecSize) const; |
35 |
- void getPatchSizeFromFileName(const QString& fileName, int& width, int& height) const; |
36 |
- #else |
37 |
-- bool loadOpenCVVecFile(const QString&, QSharedPointer<QByteArray> = QSharedPointer<QByteArray>(), QSize = QSize()) { return false; }; |
38 |
-+ bool loadOpenCVVecFile(const QString&, QImage&, QSharedPointer<QByteArray> = QSharedPointer<QByteArray>(), QSize = QSize()) { return false; }; |
39 |
- int mergeVecFiles(const QStringList&, QString&) const { return 0; }; |
40 |
- bool readHeader(const unsigned char**, int&, int&) const { return false; }; |
41 |
- void getPatchSizeFromFileName(const QString&, int&, int&) const {}; |
42 |
|
43 |
diff --git a/media-gfx/nomacs/nomacs-3.4-r1.ebuild b/media-gfx/nomacs/nomacs-3.4-r1.ebuild |
44 |
deleted file mode 100644 |
45 |
index 6972c8f5f35..00000000000 |
46 |
--- a/media-gfx/nomacs/nomacs-3.4-r1.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,75 +0,0 @@ |
49 |
-# Copyright 1999-2017 Gentoo Foundation |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
- |
52 |
-EAPI=6 |
53 |
- |
54 |
-inherit cmake-utils fdo-mime |
55 |
- |
56 |
-DESCRIPTION="Qt-based image viewer" |
57 |
-HOMEPAGE="http://www.nomacs.org/" |
58 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/3.4.tar.gz -> ${P}.tar.gz" |
59 |
- |
60 |
-LICENSE="GPL-3+" |
61 |
-SLOT="0" |
62 |
-KEYWORDS="amd64 ~amd64-linux" |
63 |
-IUSE="+jpeg opencv raw tiff zip" |
64 |
- |
65 |
-REQUIRED_USE=" |
66 |
- raw? ( opencv ) |
67 |
- tiff? ( opencv ) |
68 |
-" |
69 |
- |
70 |
-RDEPEND=" |
71 |
- dev-qt/qtconcurrent:5 |
72 |
- dev-qt/qtcore:5 |
73 |
- dev-qt/qtgui:5[jpeg?] |
74 |
- dev-qt/qtnetwork:5 |
75 |
- dev-qt/qtprintsupport:5 |
76 |
- dev-qt/qtsvg:5 |
77 |
- dev-qt/qtwidgets:5 |
78 |
- >=media-gfx/exiv2-0.25:= |
79 |
- opencv? ( media-libs/opencv:=[-qt4(-)] ) |
80 |
- raw? ( >=media-libs/libraw-0.14:= ) |
81 |
- tiff? ( media-libs/tiff:0 ) |
82 |
- zip? ( >=dev-libs/quazip-0.7.2[qt5] ) |
83 |
-" |
84 |
-DEPEND="${RDEPEND} |
85 |
- dev-qt/linguist-tools:5 |
86 |
- virtual/pkgconfig |
87 |
-" |
88 |
- |
89 |
-S="${WORKDIR}/${P}/ImageLounge" |
90 |
- |
91 |
-PATCHES=( "${FILESDIR}/${P}-no-opencv.patch" ) # bug 592134 |
92 |
- |
93 |
-src_prepare() { |
94 |
- default |
95 |
- |
96 |
- # fix build with quazip-0.7.2 - bug 598354 |
97 |
- sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die |
98 |
- sed -e "s/include <quazip/&5/" \ |
99 |
- -i src/DkLoader/DkImageLoader.cpp \ |
100 |
- -i src/DkLoader/DkImageContainer.cpp \ |
101 |
- -i src/DkLoader/DkBasicLoader.cpp \ |
102 |
- -i src/DkGui/DkDialog.cpp || die |
103 |
- |
104 |
-} |
105 |
- |
106 |
-src_configure() { |
107 |
- local mycmakeargs=( |
108 |
- -DENABLE_OPENCV=$(usex opencv) |
109 |
- -DENABLE_RAW=$(usex raw) |
110 |
- -DENABLE_TIFF=$(usex tiff) |
111 |
- -DENABLE_QUAZIP=$(usex zip) |
112 |
- -DUSE_SYSTEM_QUAZIP=ON |
113 |
- ) |
114 |
- cmake-utils_src_configure |
115 |
-} |
116 |
- |
117 |
-pkg_postinst() { |
118 |
- fdo-mime_desktop_database_update |
119 |
-} |
120 |
- |
121 |
-pkg_postrm() { |
122 |
- fdo-mime_desktop_database_update |
123 |
-} |