From 08ed7ef19d4dac6d005bcb46273ed7963c3d563b Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Mon, 1 Feb 2021 22:33:53 +0800
Subject: [PATCH] apkid-2.1.2.ebuild

---
 dev-python/apkid/Manifest                     |  3 +-
 dev-python/apkid/apkid-2.1.0-r1.ebuild        | 31 -------------------
 ....0_p20200627.ebuild => apkid-2.1.2.ebuild} |  7 +++--
 3 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 dev-python/apkid/apkid-2.1.0-r1.ebuild
 rename dev-python/apkid/{apkid-2.1.0_p20200627.ebuild => apkid-2.1.2.ebuild} (76%)

diff --git a/dev-python/apkid/Manifest b/dev-python/apkid/Manifest
index 173817477..3795e431d 100644
--- a/dev-python/apkid/Manifest
+++ b/dev-python/apkid/Manifest
@@ -1,3 +1,2 @@
-DIST apkid-2.1.0.tar.gz 126697 BLAKE2B 53f5e646ca1be98ae844ce2cf94aa410704f9ffe963203097059fbdb697883cf35ee262240874a2e4a6393035a36f3f34377e6208f6febff6422ef532455a7c5 SHA512 93e04eb21db257fcb1fb11751e3c08c0d60e1da56bb8c0f3d8fbd1e21544bb825ea70c63e1020fe9e55bfe0cef34d4928fd04699466268ac3afdc28608acd284
-DIST apkid-2.1.0_p20200627.tar.gz 55679 BLAKE2B 2ea1fd9d3a0ddf78b02771f28349776b94aa54adc061b30df1688c5375c93e8299755cf0b9093589b714f1dcd3f0e4fe29083f61ffec029cbde67bbe18c6d867 SHA512 d59f723326d6ca5ea966b85a3d35748cd331cc90703a8902cba6759af5c8859ea62ebd03481f82ad69acdda08449689db0371b4096576986c02a528fad0f8556
 DIST apkid-2.1.1.tar.gz 55685 BLAKE2B f9f3ef97bc202a4635ca8d5ce90e7ef736c8f91274dbebaa0f393fb8af10c206354453df19e21f2ce36f365d39b9840c5b6ab54b0449ccffaadd33e9ee851518 SHA512 e464a9fb0aeac49b45c377bdeb419cf54688df5c46d365fbbc46abecca54d206e255128549d71823d8537047ab2525e4e66ba761fee33b37fc6bebc1bbc3e43d
+DIST apkid-2.1.2.tar.gz 55588 BLAKE2B 5db03e23d24ffba141609ec2ef2f9215784b7446606addb819829625afbe91e338aadf23d1977e13d891d8d20111bb827d8909074d912b737f91a94261cfe1fa SHA512 384fc1b4ccb4563106479774afc31ad45565bb3d78572c427e3190593dbc9c136cd4c2efe221a8a381560d0703f35a647b54176a6ea4bcd56c14ccf2ed14dbcb
diff --git a/dev-python/apkid/apkid-2.1.0-r1.ebuild b/dev-python/apkid/apkid-2.1.0-r1.ebuild
deleted file mode 100644
index 1b7073a41..000000000
--- a/dev-python/apkid/apkid-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Android Package Protector Identifier"
-HOMEPAGE="https://github.com/rednaga/APKiD/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/yara-python[dex,${PYTHON_USEDEP}]
-	app-forensics/yara:="
-DEPEND="${RDEPEND}"
-
-src_prepare(){
-	#relax yara and regenarate rules for the current version
-	sed "s|yara-python==3.11.0|yara-python>=3.11.0|g" -i setup.py || die
-	./prep-release.py
-	#https://github.com/rednaga/APKiD/issues/211
-	sed '/argparse/d' -i setup.py || die
-	default
-}
diff --git a/dev-python/apkid/apkid-2.1.0_p20200627.ebuild b/dev-python/apkid/apkid-2.1.2.ebuild
similarity index 76%
rename from dev-python/apkid/apkid-2.1.0_p20200627.ebuild
rename to dev-python/apkid/apkid-2.1.2.ebuild
index 14fc7f95a..db4cbf67f 100644
--- a/dev-python/apkid/apkid-2.1.0_p20200627.ebuild
+++ b/dev-python/apkid/apkid-2.1.2.ebuild
@@ -10,13 +10,14 @@ inherit distutils-r1
 
 DESCRIPTION="Android Package Protector Identifier"
 HOMEPAGE="https://github.com/rednaga/APKiD/"
-
-HASH_COMMIT="5735cde8be1d52a9fa529101063ab3f3eb685424"
+#Use github to download a version with ./prep-release.py script which compiles yara rules
+HASH_COMMIT="f40e22e73f51615bbaedbc2c8c75a749c1a45d9b"
 SRC_URI="https://github.com/rednaga/APKiD/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 RDEPEND="${PYTHON_DEPS}