[gentoo-commits] repo/proj/guru:master commit in: app-crypt/tomb/files/, app-crypt/tomb/

[gentoo-commits] repo/proj/guru:master commit in: app-crypt/tomb/files/, app-crypt/tomb/

[Andrew Ammerlaan]

commit:     a5cd2750e4ab52e353cf59b61c8b7b5845e97e8d
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jun 24 21:55:28 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 23:26:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a5cd2750

app-crypt/tomb: respect ldflags, install i18n stuff

Closes: https://bugs.gentoo.org/783045
Bug: https://github.com/gentoo/guru/issues/56
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 .../tomb/files/{gtomb.patch => tomb-2.9-gtomb.patch}    |  4 ++--
 app-crypt/tomb/files/tomb-2.9-respect-ldflags.patch     | 17 +++++++++++++++++
 .../tomb/{tomb-2.9-r5.ebuild => tomb-2.9-r6.ebuild}     | 14 +++++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app-crypt/tomb/files/gtomb.patch b/app-crypt/tomb/files/tomb-2.9-gtomb.patch
similarity index 82%
rename from app-crypt/tomb/files/gtomb.patch
rename to app-crypt/tomb/files/tomb-2.9-gtomb.patch
index 264d306e5..a7ad6e65e 100644
--- a/app-crypt/tomb/files/gtomb.patch
+++ b/app-crypt/tomb/files/tomb-2.9-gtomb.patch
@@ -1,5 +1,5 @@
---- a/extras/gtomb/gtomb	2021-04-12 03:01:14.803394386 +0200
-+++ b/extras/gtomb/gtomb	2021-04-12 03:02:19.277491170 +0200
+--- a/extras/gtomb/gtomb
++++ b/extras/gtomb/gtomb
 @@ -19,8 +19,8 @@
  # along with this source code. If not, see <http://www.gnu.org/licenses/>.
  

diff --git a/app-crypt/tomb/files/tomb-2.9-respect-ldflags.patch b/app-crypt/tomb/files/tomb-2.9-respect-ldflags.patch
new file mode 100644
index 000000000..68f34eb52
--- /dev/null
+++ b/app-crypt/tomb/files/tomb-2.9-respect-ldflags.patch
@@ -0,0 +1,17 @@
+--- a/extras/kdf-keys/Makefile
++++ b/extras/kdf-keys/Makefile
+@@ -2,10 +2,10 @@
+ PREFIX ?= /usr/local
+ 
+ all:
+-	$(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2 pbkdf2.c -lgcrypt
+-	$(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2-getiter benchmark.c -lgcrypt
+-	$(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
+-	$(CC) -O2 $(CFLAGS) -o tomb-kdb-hexencode hexencode.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2 pbkdf2.c -lgcrypt
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2-getiter benchmark.c -lgcrypt
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-hexencode hexencode.c
+ 
+ test:
+ 	@echo "Running Tomb-kdb tests"

diff --git a/app-crypt/tomb/tomb-2.9-r5.ebuild b/app-crypt/tomb/tomb-2.9-r6.ebuild
similarity index 95%
rename from app-crypt/tomb/tomb-2.9-r5.ebuild
rename to app-crypt/tomb/tomb-2.9-r6.ebuild
index 1bd85d2e5..4cd8706e4 100644
--- a/app-crypt/tomb/tomb-2.9-r5.ebuild
+++ b/app-crypt/tomb/tomb-2.9-r6.ebuild
@@ -3,15 +3,17 @@
 
 EAPI="7"
 
+MYP="${P^}"
+
 inherit desktop qmake-utils toolchain-funcs xdg
 
-MYP="${P^}"
 DESCRIPTION="Tomb :: File Encryption on GNU/Linux"
 HOMEPAGE="
 	https://www.dyne.org/software/tomb
 	https://github.com/dyne/Tomb
 "
 SRC_URI="https://files.dyne.org/tomb/releases/Tomb-${PV}.tar.gz"
+S="${WORKDIR}/${MYP}"
 LICENSE="
 	GPL-3
 	gui? ( GPL-3+ )
@@ -19,9 +21,13 @@ LICENSE="
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gui test tray"
+
 #test require sudo, can't be done non interactively
 RESTRICT="test"
-PATCHES=( "${FILESDIR}/gtomb.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gtomb.patch"
+	"${FILESDIR}/${P}-respect-ldflags.patch"
+)
 DOCS=(
 	AUTHORS.txt
 	ChangeLog.txt
@@ -36,7 +42,7 @@ DOCS=(
 	doc/TKS1-draft.pdf
 	doc/tomb_manpage.pdf
 )
-S="${WORKDIR}/${MYP}"
+
 CDEPEND="
 	dev-libs/libgcrypt
 	tray? (
@@ -109,6 +115,8 @@ src_install() {
 		pushd extras/qt-tray || die
 		dobin tomb-qt-tray
 		doicon pixmaps/tomb_icon.png
+		insinto /usr/share
+		doins -r i18n
 		popd || die
 	fi