gentoo auto-resync : 01:08:2022 - 09:15:08

5 files changed, 84 insertions, 11 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c6366591a265..a1e20583a7ec 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/tc-play/Manifest b/app-crypt/tc-play/Manifest
index 62e9c892bfed..0fb176a289d3 100644
--- a/app-crypt/tc-play/Manifest
+++ b/app-crypt/tc-play/Manifest
@@ -1,4 +1,7 @@
 AUX tc-play-2.0-build.patch 677 BLAKE2B 1b0f8372a6e94a7ff2cc3c1236855d6d1973172b78586e6ee72f29723841aa700ece23be1c985b00c37196da20ea18c1b30f13d0e00fa8de6bf603cfce769110 SHA512 0f41f59b8fe4376f5d48dcb3e3ca76698b141924b6f0b3768eb46238f6d597f2a8cf3c6aa840bba57ecfd61337182eb48e627fc1a04b348849e8bc5346c82e9b
+AUX tc-play-3.3-ldflags.patch 480 BLAKE2B 3d2309cc506eea800c7cc2333d746f96d7e8c25d3a74cf2f2c669536e1e7fc6a3f6632d7720e41f9a39bef57fc8628b74034c0dd45113a4909728cef41afee9f SHA512 d878cef17e2a7ce417f33d19f6d54c00b2c4c6994f77a747686b69ffc3a378c951c215a17b7cb30d5fe026877358359141a276b93d6abbabf950b4894d31d491
 DIST tc-play-2.0.tar.gz 1015525 BLAKE2B 1481eecc8aaf2cb9698eed96a9cdabaa2b74daf11865dd29a6fab7e66fb76aa2f6e544fe7ac53a2510415ee6ddf3c5732c774a26708fe354113eb9de6a9b62d9 SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7
-EBUILD tc-play-2.0-r1.ebuild 1091 BLAKE2B fa20c56eb48cd82e71023fc434fd4fd6d77578a5ea40d521cdecb209a5f16cd867749bdd4e0f8376e4ffe8a9928b146b0d202c2d92e3ea7a95634bd8564e6781 SHA512 198c3a2b0d0c0c91d1ff69eacd36f27a5e68ee3cffdb567226aa17a577cc5cf9ee52b55c0696c290153eeef702a9144cb9d85928a86b9b52ef2169c8f2625c95
+DIST tc-play-3.3.tar.gz 2591752 BLAKE2B c02489d6e291dfc1425745af86506e72fda7f67dba0668b9250a85604ba301761b5bbbad6927238042a0f89da1035d9e3275006e34e895835a53cdc24974f419 SHA512 78cc84b1ca333e6760b87dfd22035a027bea8d562201c028247e9cfc4377260490cdc42236ef1eeb1c263a49ca1654d8ae637abdf1b4e507f958bc780fc85d94
+EBUILD tc-play-2.0-r2.ebuild 1073 BLAKE2B 048fa78747be7f9565216cb957ebc8d24d1732ef5d8b1663935c1d84bd00a56485ef5b3119d4cc98ca70dc4b9282a66ee68985c8921b66076424d1d628f14971 SHA512 d6c300ccc813cec15b1803144e92d53980db531ba962e771cb7abd1ea143e05b226cffe5d7d7426bbf86b67150acb1ee3e53fc0866c0e0ea7d389a4e2048e5cc
+EBUILD tc-play-3.3.ebuild 1084 BLAKE2B bb097cc904f223029ea6ea4209c207659fab1ea95b6db35f6a20605701eebb61c31b6f2a9f5b4f35ac98bbe255cfd9456843394732b923d07a0ab1f0cf46154d SHA512 281031b618f0a8a0f72c7df8a626264f07122aa061e77a1c0ba0862c79c5fc30d2e4477817741e9ecdacabf8e4d0c839c0326578b97eca5ce8d917d7d27ce15d
 MISC metadata.xml 252 BLAKE2B 555780b1a53410dc9c4d9157d8995e674e5306af2df14855c098124f3eb3a705007fc9d6122108f6ca8f842b968335e8a2c1866fde46d73801a9fb5eaabcd057 SHA512 1c6cddedeba42c9c2c82d30e312f953f0cee04bce36a70fbd1586dceb92407324b274de60d55f58251065d61ee186769e55b7a0d2cfc8cbff6c7e816015742f1
diff --git a/app-crypt/tc-play/files/tc-play-3.3-ldflags.patch b/app-crypt/tc-play/files/tc-play-3.3-ldflags.patch
new file mode 100644
index 000000000000..5976ecdd4d81
--- /dev/null
+++ b/app-crypt/tc-play/files/tc-play-3.3-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.classic
++++ b/Makefile.classic
+@@ -84,7 +84,7 @@ all: tcplay libtcplay.so libtcplay.a
+ 	$(CC) $(COMMON_CFLAGS) $(CFLAGS)   -c -o $@ $<
+ 
+ tcplay: $(OBJS_PROG)
+-	$(CC) $(COMMON_CFLAGS) $(CFLAGS)   -o tcplay $(OBJS_PROG) $(LIBS)
++	$(CC) $(COMMON_CFLAGS) $(CFLAGS)   -o tcplay $(LDFLAGS) $(OBJS_PROG) $(LIBS)
+ 
+ libtcplay.so.$(MAJ_VER).$(MIN_VER): $(OBJS_LIB)
+ 	$(CC) -shared -Wl,-version-script=tcplay.map -Wl,-soname=libtcplay.so.$(MAJ_VER).$(MIN_VER)  $(LDFLAGS) \
diff --git a/app-crypt/tc-play/tc-play-2.0-r1.ebuild b/app-crypt/tc-play/tc-play-2.0-r2.ebuild
index 401465c26b69..244696e5f144 100644
--- a/app-crypt/tc-play/tc-play-2.0-r1.ebuild
+++ b/app-crypt/tc-play/tc-play-2.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs multilib-minimal
+inherit toolchain-funcs
 
-DESCRIPTION="a free, pretty much fully featured and stable TrueCrypt implementation"
+DESCRIPTION="A free, pretty much fully featured and stable TrueCrypt implementation"
 HOMEPAGE="https://github.com/bwalex/tc-play"
 SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -15,19 +15,18 @@ KEYWORDS="~amd64"
 IUSE="gnutls"
 
 DEPEND="
+	dev-libs/libgcrypt:=
 	dev-libs/libgpg-error
-	sys-fs/lvm2
 	sys-apps/util-linux
-	dev-libs/libgcrypt:0
+	sys-fs/lvm2
 	gnutls? ( net-libs/gnutls )
 	!gnutls? (
-		dev-libs/openssl:0=
-	)"
+		dev-libs/openssl:=
+	)
+"
 RDEPEND="${DEPEND}"
 
-DOCS=(
-	README.md
-)
+DOCS=( README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
diff --git a/app-crypt/tc-play/tc-play-3.3.ebuild b/app-crypt/tc-play/tc-play-3.3.ebuild
new file mode 100644
index 000000000000..bb69d8e37d7b
--- /dev/null
+++ b/app-crypt/tc-play/tc-play-3.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A free, pretty much fully featured and stable TrueCrypt implementation"
+HOMEPAGE="https://github.com/bwalex/tc-play"
+SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnutls"
+
+DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	sys-apps/util-linux
+	sys-fs/lvm2
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		dev-libs/openssl:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-ldflags.patch
+)
+
+src_configure() {
+	local backend="openssl"
+	use gnutls && local backend="gcrypt"
+
+	EXTRA_MAKE_FLAGS=(
+		PBKDF_BACKEND="${backend}"
+		WARNFLAGS=""
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR)"
+		PREFIX=/usr
+		LIBDIR=/usr/$(get_libdir)
+	)
+}
+
+src_compile() {
+	emake -f Makefile.classic \
+		tcplay \
+		"${EXTRA_MAKE_FLAGS[@]}"
+}
+
+src_install() {
+	emake -f Makefile.classic \
+		"${EXTRA_MAKE_FLAGS[@]}" \
+		install_program \
+		DESTDIR="${ED}"
+}