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

2021-06-24 Thread Alessandro Barbieri 
commit: a5cd2750e4ab52e353cf59b61c8b7b5845e97e8d
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Jun 24 21:55:28 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Thu Jun 24 23:26:56 2021 +
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  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 .
  

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 0..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

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

2021-04-11 Thread Alessandro Barbieri 
commit: f843cab8ddc1a6f21ca746a608caffc89989c4f9
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr 12 01:13:08 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr 12 01:13:24 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f843cab8

app-crypt/tomb: new package

extras will be added later

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 app-crypt/tomb/Manifest  |  1 +
 app-crypt/tomb/files/gtomb.patch | 13 ++
 app-crypt/tomb/metadata.xml  | 20 +
 app-crypt/tomb/tomb-2.9.ebuild   | 88 
 4 files changed, 122 insertions(+)

diff --git a/app-crypt/tomb/Manifest b/app-crypt/tomb/Manifest
new file mode 100644
index 0..df2e537ae
--- /dev/null
+++ b/app-crypt/tomb/Manifest
@@ -0,0 +1 @@
+DIST Tomb-2.9.tar.gz 4742346 BLAKE2B 
16e287295c11f711a1fbe0f6658ed9b669de52d3766f633a1d94c3cb7d08472bbd2f03e2e3bffe1076b9c182e2441a906bebcd158f547146a94b9b96daf9b5e4
 SHA512 
425ee50130cf8b8c60488ec53aa17381f54371e624ae0211a079b7148741c28d5b7c9b6623eebe987079df890ef0fad0aa8c1daa1c7fbb79dbb502e511be20b6

diff --git a/app-crypt/tomb/files/gtomb.patch b/app-crypt/tomb/files/gtomb.patch
new file mode 100644
index 0..264d306e5
--- /dev/null
+++ b/app-crypt/tomb/files/gtomb.patch
@@ -0,0 +1,13 @@
+--- a/extras/gtomb/gtomb   2021-04-12 03:01:14.803394386 +0200
 b/extras/gtomb/gtomb   2021-04-12 03:02:19.277491170 +0200
+@@ -19,8 +19,8 @@
+ # along with this source code. If not, see .
+ 
+ ver="0.8"
+-TOMBPATH="/usr/local/bin/tomb" # Set this to your tomb executable's path
+-KDFPATH="/usr/local/bin/" # Set this to the path of your KDF binaries (if 
you're using them)
++TOMBPATH="/usr/bin/tomb" # Set this to your tomb executable's path
++KDFPATH="/usr/bin/" # Set this to the path of your KDF binaries (if you're 
using them)
+ # The ones below should not need changing
+ HEXENC="$KDFPATH/tomb-kdb-hexencode"
+ GENSALT="$KDFPATH/tomb-kdb-pbkdf2-gensalt"

diff --git a/app-crypt/tomb/metadata.xml b/app-crypt/tomb/metadata.xml
new file mode 100644
index 0..c5e7c824b
--- /dev/null
+++ b/app-crypt/tomb/metadata.xml
@@ -0,0 +1,20 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+  
+  
+
+  j...@dyne.org
+  Denis Roio
+
+  
+  
+Tomb is an 100% free and open source system for file encryption on GNU/Linux, 
facilitating the backup of secret files. Tomb is written in code that is easy 
to review and links commonly shared components.
+Tomb generates encrypted storage folders to be opened and closed using their 
associated keyfiles, which are also protected with a password chosen by the 
user.
+A tomb is like a locked folder that can be safely transported and hidden in a 
filesystem; its keys can be kept separate, for instance keeping the tomb file 
on your computer harddisk and the key files on a USB stick.
+Tomb is a simple tool to manage encrypted storage on GNU/Linux, from the 
hashes of the dyne:bolic nesting mechanism.
+  
+

diff --git a/app-crypt/tomb/tomb-2.9.ebuild b/app-crypt/tomb/tomb-2.9.ebuild
new file mode 100644
index 0..f38553c21
--- /dev/null
+++ b/app-crypt/tomb/tomb-2.9.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MYP="${P^}"
+DESCRIPTION="Tomb :: File Encryption on GNU/Linux"
+HOMEPAGE="https://www.dyne.org/software/tomb;
+SRC_URI="https://files.dyne.org/tomb/releases/Tomb-${PV}.tar.gz;
+LICENSE="
+   GPL-3
+   gui? ( GPL-3+ )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+#todo extras/desktop extras/qt-tray extras/kdf
+IUSE="gui test"
+#test require sudo, can't be done non interactively
+RESTRICT="test"
+PATCHES=( "${FILESDIR}/gtomb.patch" )
+DOCS=(
+   AUTHORS.txt
+   ChangeLog.txt
+   KNOWN_BUGS.txt
+   README.txt
+   doc/bertini_thesis.pdf
+   doc/HACKING.txt
+   doc/KEY_SPECIFICATIONS.txt
+   doc/LinuxHDEncSettings.txt
+   doc/Luks_on_disk_format.pdf
+   doc/New_methods_in_HD_encryption.pdf
+   doc/TKS1-draft.pdf
+   doc/tomb_manpage.pdf
+)
+S="${WORKDIR}/${MYP}"
+RDEPEND="
+   app-admin/sudo
+   app-crypt/gnupg
+   app-crypt/pinentry
+   app-shells/zsh
+   sys-fs/cryptsetup
+   gui? ( gnome-extra/zenity )
+"
+BDEPEND="
+   dev-python/pygments
+   sys-devel/gettext
+"
+src_compile() {
+   export PREFIX="${EPREFIX}/usr"
+   emake
+
+   #translations
+   pushd extras/translations || die
+   emake all
+   popd || die
+
+   #documentation
+   cd doc/literate || die
+   emake
+}
+
+src_install() {
+   default
+
+   #translations
+   export PREFIX="${ED}/usr"
+   pushd extras/translations || die
+   emake install
+   popd || die
+
+   #zenity gui
+   if use gui ;