Fix bug 518958

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.15/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

4 files changed, 67 insertions, 6 deletions

diff --git a/net-irc/irssi-otr/ChangeLog b/net-irc/irssi-otr/ChangeLog
index 6e5c4003296f..0c3ff011f822 100644
--- a/net-irc/irssi-otr/ChangeLog
+++ b/net-irc/irssi-otr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/irssi-otr
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-otr/ChangeLog,v 1.18 2014/11/28 13:34:03 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-otr/ChangeLog,v 1.19 2015/01/10 06:26:48 bircoph Exp $
+
+*irssi-otr-1.0.0 (10 Jan 2015)
+
+  10 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> +irssi-otr-1.0.0.ebuild,
+  +files/irssi-otr-1.0.0-cflags.patch:
+  Version bump, this fixes bug 518958 and removes block on libotr-4.
 
   28 Nov 2014; Pacho Ramos <pacho@gentoo.org> irssi-otr-0.3-r1.ebuild:
   Support python 3.4
diff --git a/net-irc/irssi-otr/Manifest b/net-irc/irssi-otr/Manifest
index 320f07f312c7..5ca4988e6537 100644
--- a/net-irc/irssi-otr/Manifest
+++ b/net-irc/irssi-otr/Manifest
@@ -1,16 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX irssi-otr-1.0.0-cflags.patch 555 SHA256 0f4fb9e226e8e81b87640adc087e2966dd9f023090133ee760293ebc900e3f8e SHA512 b34ad91361e96bf5dae84c8f38220131737e97f1e36e790bdb427370a236177ee50251939b917b32ba64a05613ec282dd64a0874d01285f311a3b0e12e6ce168 WHIRLPOOL 606da32a818a7c7bfc0ee71b8a499b18d4d272c5ecbeb759ce218b19a156a37705e5e7629fb49350fb0d0be47834992803d655707e345f87791b3276a6416071
 DIST irssi-otr-0.2.tar.gz 28618 SHA256 fbdf4375056cf5122e7aebd624364d1201f7c7473e1876f2c28dd009b7628c11 SHA512 03ddec87c5fea0e3ad60fafdcebd49340978f41dc8bf9fb5918d90aca61d1fa69634b2304b46b25822f00e3bd258e0953d8d9436384e5bfee036f36d512b08aa WHIRLPOOL d7ff7057feec54b7de48aa4d13710d3894eada1c0b5f80d324f8007b69e3e50f3e7f0976837bb129a7cf1837ff55d6960300677cf6c0d5e0673d57fff32115ec
 DIST irssi-otr-0.3.tar.gz 33514 SHA256 816cb13794c0efa33ee1618a4e926b3f1c3587c675ad3cc44b4f8de3b1b2c60e SHA512 3a3ad788b94887c6bedf6b172cd2267ac4d88fa4a78f7d2c5a8728ea9cb261339bbae1e975cbf44e5d1ec557865342cafc8beb716887ffd92742a9cd407e9f8f WHIRLPOOL ed0100ac58fa23a87b60fe5205bcd8469573df0432d9a4d9b40ddc2ba919db4a169b2cbc3410b8690f0b57e49f42e2c7f0dd46e66c8139f4c94528f6b30bf0f5
+DIST irssi-otr-1.0.0.tar.gz 39481 SHA256 bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e SHA512 988e50b9df430511ae21a9128ffd27ad27efc102aaa10ec59992c6e642f38dd776396a0768021e3a0588d2a8c30e6316a7b0720d31a05ac21bb47055b0d8c488 WHIRLPOOL 998dc495fb600e635ba342162efc153483fe838d5466995ab248d3c1da358f0cf538d020280157ffffcbe27fbe91b504ed48d1ce28bb396515f560f1fe9197f4
 EBUILD irssi-otr-0.2.ebuild 945 SHA256 dd3208b08a47d58ac0112bb746a0518d33e3d0852764f235730baffd69cbb66c SHA512 925d88f5e223a7ccdca15c29abe1ed2bc07971bc096c3f4de61c255528ceded0373f68d1a0e81e8c295d8f53bfb0997e2558a087378c892087d6318bc72c6a88 WHIRLPOOL 54a92d120f87668b7a9f2c9e5b8cbadaad0474c4ddb046b9b9efc617a90bb2aa8fdb0f47e404f1261aad69406448fd1396e96a4e06c978d32e8122f4a6fcdd3a
 EBUILD irssi-otr-0.3-r1.ebuild 998 SHA256 7027c07a093b9f66a8b1c33163000cc0e383e603fbe25f91f09144e8862c64d7 SHA512 59ec57863bbffec0921be12faa9078f9f5f8ce4436db2b74c1ed01fbd14247d461a5a004af02e191ab28fca5555b631c918a10442794237ea2ba9e21987fdb92 WHIRLPOOL f0d4eca078382c3f89bafe620a3de9e955e40f8cf17300de1216added00114d22feb0698c747dc485a7c8078ca36191311951b35cdc6b586dbf2e475b1f00ac4
-MISC ChangeLog 2620 SHA256 0dbf28cfcdd54e0d763084cbca97af3e0a908602c30cafa4615f71f7b67ddf9b SHA512 e92c374773bcccd09c607d975878d89634c47bddb0c53887bcf8b2016e370574bdbddb5d127196acec47c7e1505fd9384b7bcbf99d1267044b29a619a72140da WHIRLPOOL ab973ed4a1bee69b409cfa6841dd984e49cdb6f5e901c70b5c71de31cd58b0e96a17248e0d28c37d5e0cca35fc18d57fbc4e907b52264edac995e17914ed50bd
+EBUILD irssi-otr-1.0.0.ebuild 888 SHA256 7a7c685d2404a551bf5bafcc7f708e2939bf1ac243b1509699f4f846705acb51 SHA512 b10ea8e892a4aa23ada6c23c8e24c54ad1f712f81ae65ebca001c3adf3f6edfac39e2da7dd777416f80fd58a5c83c620b12d5917a21108ad0754d3d1e1e43b5e WHIRLPOOL 1e5fb35fcbe80db24e93e853071860822c6721af38ed358d48745373a50c04447f2d60ec764382ee41e7330b1611b6a286f0bdb9f282319ebb868e3df2e9dfdc
+MISC ChangeLog 2841 SHA256 70b0fa3a09d23a02d0eee9b383ab1706a73f5b48f6112a1ec2d93068f5343421 SHA512 9a2d78a9b2160e05aee9038ed2a65147fc8af2758754e89093b634a1c77b6d5d2c57997c553f54d5583876ca511369598d49f258f24eb09f83e2530e3cb1d10a WHIRLPOOL 0ad563dd7293595bc237eb494a22da8f62c459e7899ed703b9aa91ae4ee5406a91ff2b00d797d8069370ec85975491f7a31f68da54072585f955a409fcb74434
 MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR4ecwACgkQCaWpQKGI+9QgwgCZAZtU4HRtQTGEK1Nq/07xrwXB
-FHcAoIFLm53+za+34p+MVTxZjB0GdhDT
-=2S1r
+iQIcBAEBCAAGBQJUsMYpAAoJEFZZU7lTcnVsV8EQAI/US6HtELGmlYzsaWSAnibv
+puCT0DOMq+cy9WYUDMDPCqefsaIwZFEIa3y7/SNGKrHAirCG2ZUlJZ/ET8HDRmAc
+KTHJ8OwIHrrbjr6dFt3nuI0xrfmlTv9AHjyETAScCttd2c/YlT0VLwBQu9TjCaZW
+zp2kAJ+qrHzx4dUYLZaBb+Bej2jti9ZuoR7YzSWDYc/euoN/QahMsirhJb0dSBaz
+1f1nwzKbCHs2XWdiJzVPbml1gAOl1Xg6O1IuCW4Y+LrEQ05/BMgRLCiWk3Fl8w+4
+SJ6cEoan9SIWfGGG6xGuoSrqzUs85H6WkmQqulpCs1AhXZqyyCrHtcgocFA5Zsgs
+6zqLrLqQjEVI4O/wTY9UtOankJF9kcwqH/Me3rKuXsSRiT7XFuVzm8z7olNYSAzH
+JYYa4Ibe0xHTAQQg2MSle9sDAHQVOKh1ubi4272N4mfIOaL48FJqT8QDFTmuVaDq
+TlaaDFnJeD4jET9W/FGoXCxfwpOeOfbKab2V7jZt6mYMsMw6YWe82AiGeNHsuGZA
+3VQlQhDOXAeltRYnQtKqhLjSR64CJTUZ7kPii/WBaOsZ6U8l/2VKRdrDrMADQorO
+h87NBsRaJ45EQUtWXXu0LWC/A5we0bnFAWhpMXCxD77ejGsdH3o9slyrPJLrolmB
+1Pck8lEBBr4KB/2z7C6S
+=KfXL
 -----END PGP SIGNATURE-----
diff --git a/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch b/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch
new file mode 100644
index 000000000000..50b57c58e8a4
--- /dev/null
+++ b/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2014-02-13 04:50:45.000000000 +0400
++++ configure.ac.new	2014-12-07 12:13:17.346849284 +0300
+@@ -64,7 +64,7 @@
+ 
+ LT_INIT
+ 
+-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS"
++CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS"
+ 
+ DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include"
+ AC_SUBST(DEFAULT_INCLUDES)
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.0.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.0.ebuild
new file mode 100644
index 000000000000..1775e2b07eef
--- /dev/null
+++ b/net-irc/irssi-otr/irssi-otr-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-otr/irssi-otr-1.0.0.ebuild,v 1.1 2015/01/10 06:26:48 bircoph Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
+HOMEPAGE="https://github.com/cryptodotis/irssi-otr"
+SRC_URI="https://github.com/cryptodotis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE=""
+
+# please note >=libotr-4.1.0 is required due to critical bugfix
+# d748757e581b74e7298df155ad49174cb914102b, see README.md
+RDEPEND="
+	>=dev-libs/glib-2.22.0:2
+	>=dev-libs/libgcrypt-1.2.0:0
+	>=net-libs/libotr-4.1.0
+	>=net-irc/irssi-0.8.15"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+AUTOTOOLS_AUTORECONF="yes"
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )