Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-crypt/tomb/files/, app-crypt/tomb/
Date: Fri, 25 Jun 2021 10:11:31
Message-Id: 1624577216.a5cd2750e4ab52e353cf59b61c8b7b5845e97e8d.andrewammerlaan@gentoo
1 commit: a5cd2750e4ab52e353cf59b61c8b7b5845e97e8d
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Thu Jun 24 21:55:28 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 24 23:26:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a5cd2750
7
8 app-crypt/tomb: respect ldflags, install i18n stuff
9
10 Closes: https://bugs.gentoo.org/783045
11 Bug: https://github.com/gentoo/guru/issues/56
12 Package-Manager: Portage-3.0.20, Repoman-3.0.3
13 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
14
15 .../tomb/files/{gtomb.patch => tomb-2.9-gtomb.patch} | 4 ++--
16 app-crypt/tomb/files/tomb-2.9-respect-ldflags.patch | 17 +++++++++++++++++
17 .../tomb/{tomb-2.9-r5.ebuild => tomb-2.9-r6.ebuild} | 14 +++++++++++---
18 3 files changed, 30 insertions(+), 5 deletions(-)
19
20 diff --git a/app-crypt/tomb/files/gtomb.patch b/app-crypt/tomb/files/tomb-2.9-gtomb.patch
21 similarity index 82%
22 rename from app-crypt/tomb/files/gtomb.patch
23 rename to app-crypt/tomb/files/tomb-2.9-gtomb.patch
24 index 264d306e5..a7ad6e65e 100644
25 --- a/app-crypt/tomb/files/gtomb.patch
26 +++ b/app-crypt/tomb/files/tomb-2.9-gtomb.patch
27 @@ -1,5 +1,5 @@
28 ---- a/extras/gtomb/gtomb 2021-04-12 03:01:14.803394386 +0200
29 -+++ b/extras/gtomb/gtomb 2021-04-12 03:02:19.277491170 +0200
30 +--- a/extras/gtomb/gtomb
31 ++++ b/extras/gtomb/gtomb
32 @@ -19,8 +19,8 @@
33 # along with this source code. If not, see <http://www.gnu.org/licenses/>.
34
35
36 diff --git a/app-crypt/tomb/files/tomb-2.9-respect-ldflags.patch b/app-crypt/tomb/files/tomb-2.9-respect-ldflags.patch
37 new file mode 100644
38 index 000000000..68f34eb52
39 --- /dev/null
40 +++ b/app-crypt/tomb/files/tomb-2.9-respect-ldflags.patch
41 @@ -0,0 +1,17 @@
42 +--- a/extras/kdf-keys/Makefile
43 ++++ b/extras/kdf-keys/Makefile
44 +@@ -2,10 +2,10 @@
45 + PREFIX ?= /usr/local
46 +
47 + all:
48 +- $(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2 pbkdf2.c -lgcrypt
49 +- $(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2-getiter benchmark.c -lgcrypt
50 +- $(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
51 +- $(CC) -O2 $(CFLAGS) -o tomb-kdb-hexencode hexencode.c
52 ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2 pbkdf2.c -lgcrypt
53 ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2-getiter benchmark.c -lgcrypt
54 ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
55 ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-hexencode hexencode.c
56 +
57 + test:
58 + @echo "Running Tomb-kdb tests"
59
60 diff --git a/app-crypt/tomb/tomb-2.9-r5.ebuild b/app-crypt/tomb/tomb-2.9-r6.ebuild
61 similarity index 95%
62 rename from app-crypt/tomb/tomb-2.9-r5.ebuild
63 rename to app-crypt/tomb/tomb-2.9-r6.ebuild
64 index 1bd85d2e5..4cd8706e4 100644
65 --- a/app-crypt/tomb/tomb-2.9-r5.ebuild
66 +++ b/app-crypt/tomb/tomb-2.9-r6.ebuild
67 @@ -3,15 +3,17 @@
68
69 EAPI="7"
70
71 +MYP="${P^}"
72 +
73 inherit desktop qmake-utils toolchain-funcs xdg
74
75 -MYP="${P^}"
76 DESCRIPTION="Tomb :: File Encryption on GNU/Linux"
77 HOMEPAGE="
78 https://www.dyne.org/software/tomb
79 https://github.com/dyne/Tomb
80 "
81 SRC_URI="https://files.dyne.org/tomb/releases/Tomb-${PV}.tar.gz"
82 +S="${WORKDIR}/${MYP}"
83 LICENSE="
84 GPL-3
85 gui? ( GPL-3+ )
86 @@ -19,9 +21,13 @@ LICENSE="
87 SLOT="0"
88 KEYWORDS="~amd64"
89 IUSE="gui test tray"
90 +
91 #test require sudo, can't be done non interactively
92 RESTRICT="test"
93 -PATCHES=( "${FILESDIR}/gtomb.patch" )
94 +PATCHES=(
95 + "${FILESDIR}/${P}-gtomb.patch"
96 + "${FILESDIR}/${P}-respect-ldflags.patch"
97 +)
98 DOCS=(
99 AUTHORS.txt
100 ChangeLog.txt
101 @@ -36,7 +42,7 @@ DOCS=(
102 doc/TKS1-draft.pdf
103 doc/tomb_manpage.pdf
104 )
105 -S="${WORKDIR}/${MYP}"
106 +
107 CDEPEND="
108 dev-libs/libgcrypt
109 tray? (
110 @@ -109,6 +115,8 @@ src_install() {
111 pushd extras/qt-tray || die
112 dobin tomb-qt-tray
113 doicon pixmaps/tomb_icon.png
114 + insinto /usr/share
115 + doins -r i18n
116 popd || die
117 fi