gentoo auto-resync : 16:09:2023 - 11:00:10

5 files changed, 77 insertions, 74 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 8a0c9fe8b6e7..df48b908892b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index 4af6244754f7..9b305f34fe30 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -1,9 +1,9 @@
 AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb9263142404e495de64c8fa5cca8c1a1b4319a7d677ed930c02a6147e71f90f9a9ff0be4e80049c8540148191df170d7124be62f43c1d2c5515 SHA512 1b1fab8bdcfac682d0927075a0614ae888a1b23382ce8484b2ab9eac316f46a907bbd872615553201c5ccbf1d8f677491612956075bffacced0d408defad9e07
-AUX rotix-0.83-cc-cflags-lflags.patch 1411 BLAKE2B 660d530265180f2eade64ba70a1a0402e1e3d822a29ba130e60a04d94253231650ba1cfa58e962c38858d8c35ecc80089f6c31695513fd81966d1a8014ee71e1 SHA512 a04ab4f8f9473b00d0c5d1ae2a04bd0cde7a21947c47213dc71f00dc3787d65bec627f1c30402945b3b0163413b26a2db163ef9afa76561e342d720c72bab257
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
 AUX rotix-0.83-locale.patch 206 BLAKE2B 98f179037eaebee3ca2c1f41d543dba29fc61209518b3abec238473a38da0d3140aed50ed5a33ed1d0656336df2f3a236cd0f8ced9f0795d807710f1978f881f SHA512 caa6430c0bf96fccae2547524c7eb81170e27ef2adb054671db0f1d8f88ed6a4960b827d1781af4adbf5216c00e007a48071b1b4237f5a691bd46e45bbd599a0
+AUX rotix-0.83-meson-build.patch 1235 BLAKE2B 84af034797a8a309d13925f734097e5c1ee4b0348bb2a9d1412bff7e72f27d263624a3f2b8f44264a816fdfaee9a9e6d12bc2c9c5babde2124e8ec1d4b0c6b99 SHA512 de8f0d07d434c834384934b4f9e6e3390e206ac63e436e7ba038b5e772ef71c2494868b326c365d5b7fa78fb6d07a0627ea75e9e93c9c2924f4e6d1ae310cbf1
 AUX rotix-0.83-nl.po-charset.patch 807 BLAKE2B d8482b4244facbff9cc37975edb3ee0613ba90fee69b6ec67c7a04e3812ce05701a3e38038e12ddf1bff2699de8be2d9cba713448e444feb9cfd972c77b9e3d4 SHA512 468e616e8b97b42652abdf7b9f2082233b0084cb971b2fd7dbb26e020777531f5aea758910738270bed3923ba4ce7930d5edcd42f976d549468bd0b08d4bcf7f
 DIST rotix-0.83.tar.gz 15412 BLAKE2B 4a0db309fa23af3e15a63263e40a2b27e2ebf1e0cf162f2776ebd5237621207eee3a41374170c2e0441104704bde4aff8f929fc5ad8994dfcf4fd1cb5a461696 SHA512 bffe527714f35a99f3322e87d1e2fcbafd38f3a7677e2ca816988df2ce1567ce064f0ab7a543fab3dc2d73f148675fe069c398a5d9c7bb285cb6b1658c3fbffb
 EBUILD rotix-0.83-r1.ebuild 800 BLAKE2B 720423e54f7e829944a9a958ad4868e80ec32cfc9cdd6e6ce992ec2363433a78a6d290c29ee10d26ff51db663c33a0af8d7930b7447bfe9b8cb9f4d095e3a443 SHA512 cdb690a367fdcb20c0446ef57a69dfbbbd89d174182c9d5897ef7e4c010ea18a7d3f5cbd2b2da69cd69c7f6937fad004e762fa6a954a2d32873d06f6744fb6ce
-EBUILD rotix-0.83-r2.ebuild 896 BLAKE2B 4e12fcbb8667acbb3122a09b0e03c31a1c7e3fc88ab3a7ad87cafec7975a013703753063a1cd17c969b27396fa8e4445b78d290b7b8c4b0df822391e3257f32f SHA512 5a5ac5eadab8c93b92aee44f92eb38a97d42dd18c27d595447b863e30fdd31a8607c063fd3d6974aafee071be56161ae4051033b0aba8b342032611d4a3d2fc9
+EBUILD rotix-0.83-r3.ebuild 866 BLAKE2B e30a6ea03e70b401f451393116fd823b352ea0ec0d2cdf9e1898ac7e01a689ed82936231247115c873fbd1290d83a4624ac147dbe15a47f98314551ed37b8070 SHA512 cc27fbae319938ca12860a8d5b8ff3f34ba33a81e441bb4ea4b443925439d0442e3573a5e826ce9365cfc119111a1dd714cd435bd1dce8568705cc5931c90ed2
 MISC metadata.xml 248 BLAKE2B b4fe04f63894c1e80ba5c13119bbe5b1eb8dbbbfe86a5d0cfe4fb2998c1b045523c2039787212e05e1ed08ebbbfd83386de86de00fc38e7d4e946bcbad117502 SHA512 7e1ead3f76b507b555179148f9c10a3fa3401df81bf4461d456b3255e9844ed4e706d2788761587b086a5e89b430c1149856733a142f3f58ecbe55c2f2ccad8e
diff --git a/app-crypt/rotix/files/rotix-0.83-cc-cflags-lflags.patch b/app-crypt/rotix/files/rotix-0.83-cc-cflags-lflags.patch
deleted file mode 100644
index 2cb97fdc52ac..000000000000
--- a/app-crypt/rotix/files/rotix-0.83-cc-cflags-lflags.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 615eaabfa00cbef1b783bd3026fdfa3f45385e53 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Thu, 14 Sep 2023 00:20:51 +0300
-Subject: [PATCH] Respect CFLAGS, STRIP and CC, append LDFLAGS to linking
-
---- a/Makefile
-+++ b/Makefile
-@@ -22,12 +22,6 @@
- 
- include Makefile.settings
- 
--ifdef DEBUG
--CFLAGS += -g3
--else
--CFLAGS += -O3
--endif
--
- ifdef I18N
- CFLAGS += -DPACKAGE=\"${PACKAGE}\" -D LOCALEDIR=\"${LOCALE}\"
- endif
-@@ -39,7 +33,7 @@ endif
- all : rotix po
- 
- rotix : rot.o help.o rotix.o
--	$(CC) -Wall $(CFLAGS) -o rotix rot.o help.o rotix.o
-+	$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(LFLAGS) -o rotix rot.o help.o rotix.o
- ifdef STRIP
- ifndef DEBUG
- 	$(STRIP) rotix
---- a/configure
-+++ b/configure
-@@ -82,14 +82,7 @@ if [ "$i18n" = "1" ]; then
- 	fi;
- fi
- 
--if type gcc > /dev/null 2> /dev/null; then
--	echo "CC=gcc" >> Makefile.settings;
--elif type cc > /dev/null 2> /dev/null; then
--	echo "CC=cc" >> Makefile.settings;
--else
--	echo 'Cannot find a C compiler, aborting.'
--	exit 1;
--fi
-+echo "CC?=cc" >> Makefile.settings;
- 
- if [ "$strip" = "1" ]; then
- 	if type strip > /dev/null 2> /dev/null; then
-@@ -101,10 +94,7 @@ if [ "$strip" = "1" ]; then
- 	else
- 		echo 'No strip utility found, cannot remove unnecessary parts from executable.'
- 		echo ''
--		echo 'STRIP=0' >> Makefile.settings;
- 	fi
--else
--	echo 'STRIP=0' >> Makefile.settings;
- fi
- 
- case "$arch" in
--- 
-2.41.0
-
diff --git a/app-crypt/rotix/files/rotix-0.83-meson-build.patch b/app-crypt/rotix/files/rotix-0.83-meson-build.patch
new file mode 100644
index 000000000000..c18d5f1329a2
--- /dev/null
+++ b/app-crypt/rotix/files/rotix-0.83-meson-build.patch
@@ -0,0 +1,61 @@
+https://github.com/shemminga/rotix/pull/3
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Fri, 15 Sep 2023 17:00:38 +0300
+Subject: [PATCH 1/3] Implementing meson build-system
+
+Replacing old configure/make system.
+--- /dev/null
++++ b/meson.build
+@@ -0,0 +1,17 @@
++project('rotix', 'c', version: '0.83', license: 'GPL-2.0-or-later')
++cc = meson.get_compiler('c')
++
++if get_option('i18n')
++  subdir('po')
++endif
++
++if not cc.check_header('getopt.h')
++  add_project_arguments('-DNO_GETOPT_LONG=1', language:'c')
++endif
++
++
++src = ['help.c', 'rot.c', 'rotix.c']
++
++executable('rotix', sources: src, install: true)
++install_man('rotix.1')
++
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,2 @@
++option('i18n', type: 'boolean', value: true)
++
+--- /dev/null
++++ b/po/LINGUAS
+@@ -0,0 +1 @@
++nl
+--- /dev/null
++++ b/po/POTFILES
+@@ -0,0 +1,4 @@
++help.c
++rot.c
++rotix.c
++
+--- /dev/null
++++ b/po/meson.build
+@@ -0,0 +1,10 @@
++i18n = import('i18n')
++
++add_project_arguments(
++  [
++    '-DI18N=1',
++    '-DPACKAGE="rotix"',
++    '-DLOCALEDIR="@0@"'.format( get_option('prefix') / get_option('localedir'))
++  ], language:'c')
++i18n.gettext(meson.project_name())
++
+similarity index 100%
+rename from po/NL.po
+rename to po/nl.po
+-- 
+2.41.0
+
diff --git a/app-crypt/rotix/rotix-0.83-r2.ebuild b/app-crypt/rotix/rotix-0.83-r3.ebuild
index ee8600113fa1..bcef6159843f 100644
--- a/app-crypt/rotix/rotix-0.83-r2.ebuild
+++ b/app-crypt/rotix/rotix-0.83-r3.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit meson
 
 DESCRIPTION="Rotix allows you to generate rotational obfuscations"
 HOMEPAGE="https://github.com/shemminga/rotix"
 SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
@@ -18,21 +18,24 @@ BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="nls? ( virtual/libintl )"
 
 PATCHES=(
-	"${FILESDIR}/rotix-0.83-cc-cflags-lflags.patch"
+	"${FILESDIR}/rotix-0.83-meson-build.patch"
 	"${FILESDIR}/rotix-0.83-locale.patch"
 	"${FILESDIR}/rotix-0.83-interix.patch"
 	"${FILESDIR}/rotix-0.83-nl.po-charset.patch"
 )
 
-src_configure() {
-	econf --i18n=$(usex nls 1 0) --strip=0 --debug=0
-}
+DOCS=(
+	README
+)
 
-src_compile() {
-	emake CC=$(tc-getCC)
+src_prepare() {
+	default
+	mv po/{NL,nl}.po || die
 }
 
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc README
+src_configure() {
+	local emesonargs=(
+		$(meson_use nls i18n)
+	)
+	meson_src_configure
 }