net-im/mcabber: patch bug 699972

Bug: https://bugs.gentoo.org/699972
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin <andrey_utkin@gentoo.org>

diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index ce87b9acbbb8ff6725139225a0944058212082d7..ecb3948b02328fac1247f1e805d9137310b07450 100644 (file)
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1 +1,2 @@
 DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
+DIST mcabber-1.1.0_bug699972.patch 1385 BLAKE2B f63316f93347b24f27e5f9a5c26de6ae1af199819efbf390915b06ba70c86ec35759c4529c20e3a7c4d8c84081bca008e90ceba8401032ba884d269355940e22 SHA512 d29acca9e710011a8f30dca1c0e281976d409d4072823527078e5f54e98fea4b637c9e52c998bc26a7a4c445d08acd3eea3a244441dac479c398dac0e786535a

diff --git a/net-im/mcabber/mcabber-1.1.0-r2.ebuild b/net-im/mcabber/mcabber-1.1.0-r2.ebuild
index 75d371a188d93bef1967bef6eb1bcd6e526715c2..b2af621ada02d5e2406c523978cfa40d0028a851 100644 (file)
--- a/net-im/mcabber/mcabber-1.1.0-r2.ebuild
+++ b/net-im/mcabber/mcabber-1.1.0-r2.ebuild
@@ -16,6 +16,7 @@ if [[ "${PV}" == 9999 ]]; then
        S="${WORKDIR}/${PN}"
 else
        SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
+       SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}_bug699972.patch"
        KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
@@ -43,8 +44,15 @@ RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
+# only for patching 1.1.0 release, don't port to later ebuilds
+DEPEND+=" sys-devel/automake:1.14"
+
 DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
 
+PATCHES=(
+       "${DISTDIR}/${P}_bug699972.patch"
+)
+
 pkg_setup() {
        if use aspell && use spell; then
                ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."