gentoo resync : 05.02.2020

4 files changed, 39 insertions, 4 deletions

diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
index d003a2b0e9b1..d154e43468fe 100644
--- a/x11-misc/habak/Manifest
+++ b/x11-misc/habak/Manifest
@@ -1,7 +1,8 @@
 AUX README.en 6729 BLAKE2B e7c97c01b774d6813bb87373b8634000b71094ad6668e6402805d8fd5ee6ec1cea523bd4239f0ae1b7d4f53fecfc7545c4990a172b87a13a8a0615d53b81ecc8 SHA512 2857284f10734223fc03c57150f796bad07ecdcf9fd687893155f16b3633903df322d397be7f5e51f2c5ac87ae27d246549dd098b36e061ffa2d2dd3ae610e58
+AUX habak-0.2.5-fno-common.patch 586 BLAKE2B c6ad2d23f671ceee49059a87b50ba8405110c215961b0a89290224a470b7774c729d025e27cca98cc20d774ba47250e0f3fbcb9b6daca28699614fa28ad2ba55 SHA512 0e6ac0ba7555bfe9a8ca721575f7ae86331a6d31d76c28f1a52194cefd73646e6e52d90c5ca4601e3a8baea9ceb4c3cce08f75607fd65244ff4798fe668fcec3
 AUX habak-0.2.5-gentoo.patch 796 BLAKE2B 901f4673a8509029fde736c4dea5f809c268682b8a1800f51b21da40eb052a537e199193546c46169cb2d2914e61dbd8861b6e792f7618d8deba1122a2cf9a34 SHA512 0e18a2186dc533fe6defbb089e31999d16b1da3ed18a1315c6c54ea20b52641114a94cdc62d952d9dfe33f2a03899028aef4d6552141e79fb9399e9e42b396ca
 DIST habak-0.2.5-sourceforge.tar.gz 28747 BLAKE2B 60c6f60e0a16dca2091f41c9e4f419e5fb4be88a3ce44de98d91740f94e468fb7bd64bbf0b399b64035c21547b50fccf2e40954e0ff59ab1f1c0ce8dc6e56670 SHA512 4b1ff1484c65f74441b297e558360a8f2ea8f12ac63c4b74f846e41328dd84a1d619bde55e81224c3bd527897625e17bc07a6bb0d4cc3bd0eec6f4e787201277
 DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188
-EBUILD habak-0.2.5-r2.ebuild 955 BLAKE2B ce9836d9b21573542341bc80036cd83b0e5305be8e2fb446cb8896820dcd1beb375b5d5d41769660729248483ff7202c957703015c3d94b46c0ad56a78fa4590 SHA512 32324ee7e7f9401b99e3186d6f684581ec9855e1f9ebaf18fda0d016abfb5d7a7347d91fe68e5aeadac3e76c35aa17416652f2fb00d2dc168284d2b0ab3a6bd6
-EBUILD habak-0.2.5-r3.ebuild 787 BLAKE2B e792615c561d5433f74719d61440daf69544d3a343254da0218d0c70c6730b49ae8c8237cd74d9d380aa8cb6f0d518f4a421fc8dcfb5d4bdef9f7e646835b69f SHA512 cf414a9b0b5acf812d518a08683115550f24df563e00d916fb06328bdc477ae0984f04c98e4247e01e7f1ed8bffecb495b4b82868eefafea076fc400697b7364
+EBUILD habak-0.2.5-r2.ebuild 956 BLAKE2B 0c27836b12bcad965a56827eba474bbbe2f8d171e13d4decfdf27134f4f130d4c117ac3a870d627995b0b498eeba69a306689bf945dc991c22d879d89ec1f1d3 SHA512 04888da2afaeff9d95e7feec77fac246954039349b0f1de668b61b71499b448ebeb45b2a85795c1d53743cc8a08b80b3829167493882297e4ed4271c9265c2b3
+EBUILD habak-0.2.5-r3.ebuild 824 BLAKE2B 082076f0220dc405bf34ca692b4fb20d919b467a1c2f1aeb9fea58dd855059a11f11fbb48a22609d0b56c7520cecc4bac9f1be76aa1f53650be6ff6749ae4da0 SHA512 2aa8fde84208f8c979690386d2ffa4294b9f568ae3206a03587841265d3db821d67500b57a401ff60e39867a2ab7e92f42388362d4c9d2cadef3bf794879a475
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/habak/files/habak-0.2.5-fno-common.patch b/x11-misc/habak/files/habak-0.2.5-fno-common.patch
new file mode 100644
index 000000000000..0fad5f4df563
--- /dev/null
+++ b/x11-misc/habak/files/habak-0.2.5-fno-common.patch
@@ -0,0 +1,33 @@
+--- a/src/random.c
++++ b/src/random.c
+@@ -8,12 +8,15 @@
+ #include <regex.h>
+ 
+ #include <errno.h>
++
++#include "i.h"
++
+ extern int errno;
+ int syserr;
+ 
+ #define ALLOC_STEP 1000
+ regex_t regexp;
+-int size_files=0, used_files=0, i=0;
++int size_files=0, used_files=0;
+ char **files, *wyjscie;
+ regmatch_t matchpos;
+ 
+--- a/src/habak.c
++++ b/src/habak.c
+@@ -14,6 +14,7 @@
+ #include <Imlib2.h>
+ #include "types.h"
+ #include "proto.h"
++#include "i.h"
+ 
+ habak_l *current_list_item=NULL, *first_list_item=NULL;
+ habak_t *current_habak;
+--- /dev/null
++++ b/src/i.h
+@@ -0,0 +1 @@
++extern int i;
diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild
index 0fe95e372ed3..eccf2565b00a 100644
--- a/x11-misc/habak/habak-0.2.5-r2.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/fvwm-crystal/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/imlib2[X]
diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild
index 1dcc37e3e714..4279398d92db 100644
--- a/x11-misc/habak/habak-0.2.5-r3.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,7 @@ DEPEND="
 "
 DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en )
 PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 )