From f8d0a919263a1417704a4a5177fe9e59232aa50a Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Tue, 26 May 2020 11:05:23 +0800
Subject: [PATCH] yara: 4.0.1 bump, cleanup

---
 app-forensics/yara/Manifest                        |  2 +-
 .../{yara-3.11.0-r1.ebuild => yara-4.0.1.ebuild}   |  7 +++++++
 dev-python/yara-python/Manifest                    |  1 +
 dev-python/yara-python/files/yara-systemlib.patch  |  9 ---------
 ...thon-3.11.0.ebuild => yara-python-4.0.1.ebuild} | 14 ++++++++------
 5 files changed, 17 insertions(+), 16 deletions(-)
 rename app-forensics/yara/{yara-3.11.0-r1.ebuild => yara-4.0.1.ebuild} (65%)
 delete mode 100644 dev-python/yara-python/files/yara-systemlib.patch
 rename dev-python/yara-python/{yara-python-3.11.0.ebuild => yara-python-4.0.1.ebuild} (71%)

diff --git a/app-forensics/yara/Manifest b/app-forensics/yara/Manifest
index 65fd3caab..865ee4239 100644
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@@ -1,2 +1,2 @@
-DIST yara-3.11.0.tar.gz 772122 BLAKE2B 9a2bfbb8f972fcfe2652f8fe0804d7d944c324e623433e925671fde945c53ce4727f00ea7ae93aafc3dc9b0c60ade9a138a7c572679a8da8b567e1316ec3744f SHA512 26d800284a2de07195e4a480eb7125b1f5ad0265b284bfbeee10dbab162ea0f419c9e2ea5c4ed5fa25a46a2c9e3c6b077dfe1cafece79251e20d5d70f91b80a8
 DIST yara-4.0.0.tar.gz 884079 BLAKE2B 2a5b768a54f34f3832daa7299412276ba17fc320dc5da206ee4d3330bbe05692d974c5179244a13040bf0578f9a5a8c1fafc219a3019bcb99e27295b52642da9 SHA512 b78dac06d6f8b4153f3939fd3a5f6d50544c078520c240baa4bae00c552bf98d374c60629b256a75fe8943ef44830d5313e43f88cfb07ab561d22148f56b6fb7
+DIST yara-4.0.1.tar.gz 889069 BLAKE2B d56ba0c989f28c802b4474832f595360a246740a67aff8106a7ded8ce0c4636afac487d17b1e2470ee21741d95b71b78dbd7679e71bc1f84dbfc9d2f2c0d48ed SHA512 5d91b8df242299084916d9634e950359e7a9df26a7964ca2ca52cecf79a969d5aefd1c2dd89f5e762cf3a3c907cd616bd738b540f8600ad94522cbc3f1b031d3
diff --git a/app-forensics/yara/yara-3.11.0-r1.ebuild b/app-forensics/yara/yara-4.0.1.ebuild
similarity index 65%
rename from app-forensics/yara/yara-3.11.0-r1.ebuild
rename to app-forensics/yara/yara-4.0.1.ebuild
index cba616c5b..8719e03d2 100644
--- a/app-forensics/yara/yara-3.11.0-r1.ebuild
+++ b/app-forensics/yara/yara-4.0.1.ebuild
@@ -26,3 +26,10 @@ src_prepare() {
 src_configure() {
 	econf $(use_enable dex)
 }
+
+#  --enable-profiling      enable rules profiling support
+#  --enable-cuckoo         enable cuckoo module
+#  --enable-magic          enable magic module
+#  --enable-dotnet         enable dotnet module
+#  --enable-macho          enable macho module
+#  --enable-debug-dex      enable dex module debugging
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index b87a6adfc..8a38b8c43 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,2 +1,3 @@
 DIST yara-python-3.11.0.tar.gz 31830 BLAKE2B f00cbeabf9adf174e1b4fd95b665cc3cdf64e76b64dde64925fb4222a1eceaf36389162cf4fbbabbedfa852f06e220de99032210ae6d7e3dcb2a1c9220c81841 SHA512 0c8e6cbe51aa858c6d56b95c88bd450016924008b57b4910ed8edfb7bba4d7bfc18736844817978f74e72bed6765c484f275de4e7a53ec85048fb01713b6e959
 DIST yara-python-4.0.0.tar.gz 32201 BLAKE2B 31641d50285eba140fae372f411a9531374702c6a0f48986caff56b04d085bcd6d84a6cadd91f3a585c546132f2b538a656ef5c08ec0159ce4fb1b900cd5454a SHA512 9210793d305e34313494e3d867fc3a729814401208206a0f6f7fd2bfdcb6482a8e19e64788c35c149cd5a65cdc5357d8fa1e020fae6ac8c2704fa55e6c2cb989
+DIST yara-python-4.0.1.tar.gz 32251 BLAKE2B 465abf3fdb995c4366ffc1fbfbaec6122f1d916c8ac3c9e5381f31e7784d22b50c1afde6862ecc544799e082c8230e46038a5c58d0f7796d25c71d8d78db247c SHA512 8bd4ba51dbec38cb6b9c18b4d8b9325d5bfc413af1462682497398ab86ab67e4cd19355bdaacf1d075098e281ad0d5e9bf748eb5b7fbe404dcf0955cb688e2aa
diff --git a/dev-python/yara-python/files/yara-systemlib.patch b/dev-python/yara-python/files/yara-systemlib.patch
deleted file mode 100644
index 89b36bd56..000000000
--- a/dev-python/yara-python/files/yara-systemlib.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- setup.py.orig	2019-05-02 17:34:46.000000000 +0800
-+++ setup.py	2019-05-07 08:20:20.841022106 +0800
-@@ -325,5 +325,5 @@
-         'update': UpdateCommand},
-     ext_modules=[Extension(
-         name='yara',
--        include_dirs=['yara/libyara/include', 'yara/libyara/', '.'],
-+        libraries = ['yara'],
-         sources=['yara-python.c'])])
diff --git a/dev-python/yara-python/yara-python-3.11.0.ebuild b/dev-python/yara-python/yara-python-4.0.1.ebuild
similarity index 71%
rename from dev-python/yara-python/yara-python-3.11.0.ebuild
rename to dev-python/yara-python/yara-python-4.0.1.ebuild
index c0cf240f0..49b195270 100644
--- a/dev-python/yara-python/yara-python-3.11.0.ebuild
+++ b/dev-python/yara-python/yara-python-4.0.1.ebuild
@@ -14,14 +14,16 @@ SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test +dex"
 
 RDEPEND="${PYTHON_DEPS}
-	~app-forensics/yara-${PV}"
+	~app-forensics/yara-${PV}[dex?]"
 DEPEND="${RDEPEND}"
 
-#https://github.com/pentoo/pentoo-overlay/issues/397
-#patch to use a system yara
-python_prepare() {
-	eapply -p0 "${FILESDIR}"/yara-systemlib.patch
-	default
+src_compile() {
+	compile_python() {
+		${EPYTHON} setup.py build --dynamic-linking
+		distutils-r1_python_compile
+	}
+	python_foreach_impl compile_python
 }