Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/qhexedit2/, app-editors/qhexedit2/files/
Date: Mon, 02 May 2022 12:08:42
Message-Id: 1651493316.33e5acc534fecffb02f564b62947063370f7b358.juippis@gentoo
1 commit: 33e5acc534fecffb02f564b62947063370f7b358
2 Author: Victor Kustov <ktrace <AT> yandex <DOT> ru>
3 AuthorDate: Mon Apr 18 18:47:40 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon May 2 12:08:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e5acc5
7
8 app-editors/qhexedit2: bump to 0.8.9
9
10 - bump version
11 - switch to vanile Simsys/qhexedit
12
13 Signed-off-by: Victor Kustov <ktrace <AT> yandex.ru>
14 Package-Manager: Portage-3.0.30, Repoman-3.0.3
15 Closes: https://github.com/gentoo/gentoo/pull/25095
16 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
17
18 app-editors/qhexedit2/Manifest | 1 +
19 app-editors/qhexedit2/files/qhexedit2-0.8.9.patch | 36 ++++++++++
20 .../qhexedit2/qhexedit2-0.8.9_p20210525.ebuild | 79 ++++++++++++++++++++++
21 3 files changed, 116 insertions(+)
22
23 diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
24 index 31427cf34c3b..cd73ea49b28c 100644
25 --- a/app-editors/qhexedit2/Manifest
26 +++ b/app-editors/qhexedit2/Manifest
27 @@ -1 +1,2 @@
28 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
29 +DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
30
31 diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch
32 new file mode 100644
33 index 000000000000..cabbd77ac843
34 --- /dev/null
35 +++ b/app-editors/qhexedit2/files/qhexedit2-0.8.9.patch
36 @@ -0,0 +1,36 @@
37 +diff --git a/setup.py b/setup.py
38 +index 1a0d912..646c359 100644
39 +--- a/setup.py
40 ++++ b/setup.py
41 +@@ -98,7 +98,7 @@ if cfg.qt_framework:
42 + lib + ".framework", "Headers")]
43 + else:
44 + if PyQt_Version == 'PyQt5':
45 +- for qt_inc_dir in ('/usr/include/qt', '/usr/include/x86_64-linux-gnu/qt5'):
46 ++ for qt_inc_dir in ('/usr/include/qt', '/usr/include/qt5'):
47 + include_dirs.append(qt_inc_dir)
48 + include_dirs += [os.path.join(qt_inc_dir, lib) for lib in qt_libs]
49 + libraries = ["Qt5" + lib[2:] for lib in qt_libs]
50 +diff --git a/src/qhexedit.pro b/src/qhexedit.pro
51 +index 2a94016..55d7bc2 100644
52 +--- a/src/qhexedit.pro
53 ++++ b/src/qhexedit.pro
54 +@@ -23,5 +23,7 @@ Release:TARGET = qhexedit
55 + Debug:TARGET = qhexeditd
56 +
57 +
58 +-unix:DESTDIR = /usr/lib
59 + win32:DESTDIR = ../lib
60 ++
61 ++target.path = /usr/lib64
62 ++INSTALLS += target
63 +diff --git a/src/qhexedit.sip b/src/qhexedit.sip
64 +index 082621e..a7ef4e7 100644
65 +--- a/src/qhexedit.sip
66 ++++ b/src/qhexedit.sip
67 +@@ -1,4 +1,4 @@
68 +-%Module(name=qhexedit, version=1)
69 ++%Module(name=qhexedit)
70 +
71 + %Import QtCore/QtCoremod.sip
72 + %Import QtGui/QtGuimod.sip
73
74 diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
75 new file mode 100644
76 index 000000000000..0818ddefb0cb
77 --- /dev/null
78 +++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
79 @@ -0,0 +1,79 @@
80 +# Copyright 1999-2022 Gentoo Authors
81 +# Distributed under the terms of the GNU General Public License v2
82 +
83 +EAPI=8
84 +
85 +PYTHON_COMPAT=( python3_{8,9,10} )
86 +
87 +#DISTUTILS_OPTIONAL=1
88 +#DISTUTILS_USE_PEP517=p
89 +
90 +inherit distutils-r1 qmake-utils
91 +
92 +EGIT_COMMIT="541139125be034b90b6811a84faa1413e357fd94"
93 +DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
94 +HOMEPAGE="https://github.com/Simsys/qhexedit2/"
95 +SRC_URI="https://github.com/Simsys/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
96 +
97 +LICENSE="GPL-2"
98 +SLOT="0"
99 +KEYWORDS="~amd64 ~riscv ~x86"
100 +IUSE="doc +gui python"
101 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
102 +
103 +PATCHES=( "${FILESDIR}/${PN}-0.8.9.patch" )
104 +
105 +RDEPEND="
106 + dev-qt/qtcore:5
107 + dev-qt/qtgui:5
108 + dev-qt/qtwidgets:5
109 + python? (
110 + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
111 + ${PYTHON_DEPS}
112 + )
113 +"
114 +DEPEND="${RDEPEND}"
115 +
116 +S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
117 +
118 +src_configure() {
119 + eqmake5 src/qhexedit.pro
120 + if use gui; then
121 + cd example || die "can't cd example"
122 + eqmake5 qhexedit.pro
123 + fi
124 +}
125 +
126 +src_compile() {
127 + default
128 + use python && distutils-r1_src_compile
129 + use gui && emake -C example
130 +}
131 +
132 +python_compile() {
133 + use python && distutils-r1_python_compile build_ext
134 +}
135 +
136 +src_test() {
137 + cd test || die "can't cd test"
138 + mkdir logs || die "can't create logs dir"
139 + eqmake5 chunks.pro
140 + emake
141 + ./chunks || die "test run failed"
142 + grep -q "^NOK" logs/Summary.log && die "test failed"
143 +}
144 +
145 +src_install() {
146 + doheader src/*.h
147 + dolib.so libqhexedit.so*
148 + use python && distutils-r1_src_install
149 + if use gui; then
150 + dobin example/qhexedit
151 + insinto /usr/share/${PN}/
152 + doins example/translations/*.qm
153 + fi
154 + if use doc; then
155 + dodoc -r doc/html
156 + dodoc doc/release.txt
157 + fi
158 +}