| 1 |
commit: 583e7f0f0b3dad688c4ba2bdce64ecdf0da417dd |
| 2 |
Author: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 31 00:30:10 2019 +0000 |
| 4 |
Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 31 00:47:57 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583e7f0f |
| 7 |
|
| 8 |
net-im/mcabber: patch bug 699972 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/699972 |
| 11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.16 |
| 12 |
Signed-off-by: Andrey Utkin <andrey_utkin <AT> gentoo.org> |
| 13 |
|
| 14 |
net-im/mcabber/Manifest | 1 + |
| 15 |
net-im/mcabber/mcabber-1.1.0-r2.ebuild | 8 ++++++++ |
| 16 |
2 files changed, 9 insertions(+) |
| 17 |
|
| 18 |
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest |
| 19 |
index ce87b9acbbb..ecb3948b023 100644 |
| 20 |
--- a/net-im/mcabber/Manifest |
| 21 |
+++ b/net-im/mcabber/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f |
| 24 |
+DIST mcabber-1.1.0_bug699972.patch 1385 BLAKE2B f63316f93347b24f27e5f9a5c26de6ae1af199819efbf390915b06ba70c86ec35759c4529c20e3a7c4d8c84081bca008e90ceba8401032ba884d269355940e22 SHA512 d29acca9e710011a8f30dca1c0e281976d409d4072823527078e5f54e98fea4b637c9e52c998bc26a7a4c445d08acd3eea3a244441dac479c398dac0e786535a |
| 25 |
|
| 26 |
diff --git a/net-im/mcabber/mcabber-1.1.0-r2.ebuild b/net-im/mcabber/mcabber-1.1.0-r2.ebuild |
| 27 |
index 75d371a188d..b2af621ada0 100644 |
| 28 |
--- a/net-im/mcabber/mcabber-1.1.0-r2.ebuild |
| 29 |
+++ b/net-im/mcabber/mcabber-1.1.0-r2.ebuild |
| 30 |
@@ -16,6 +16,7 @@ if [[ "${PV}" == 9999 ]]; then |
| 31 |
S="${WORKDIR}/${PN}" |
| 32 |
else |
| 33 |
SRC_URI="http://mcabber.com/files/${P}.tar.bz2" |
| 34 |
+ SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}_bug699972.patch" |
| 35 |
KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 36 |
fi |
| 37 |
|
| 38 |
@@ -43,8 +44,15 @@ RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 ) |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
virtual/pkgconfig" |
| 41 |
|
| 42 |
+# only for patching 1.1.0 release, don't port to later ebuilds |
| 43 |
+DEPEND+=" sys-devel/automake:1.14" |
| 44 |
+ |
| 45 |
DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt ) |
| 46 |
|
| 47 |
+PATCHES=( |
| 48 |
+ "${DISTDIR}/${P}_bug699972.patch" |
| 49 |
+) |
| 50 |
+ |
| 51 |
pkg_setup() { |
| 52 |
if use aspell && use spell; then |
| 53 |
ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred." |
Archives