gentoo auto-resync : 04:10:2023 - 23:52:39

4 files changed, 68 insertions, 0 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 387e2ed190ee..aaaf366ee3a6 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-otr/Manifest b/x11-plugins/pidgin-otr/Manifest
index 943f0ba71ce6..4c727e31e2d4 100644
--- a/x11-plugins/pidgin-otr/Manifest
+++ b/x11-plugins/pidgin-otr/Manifest
@@ -1,3 +1,5 @@
+AUX pidgin-otr-4.0.2-dont-clobber-fortify-source.patch 634 BLAKE2B e40228f111b4314d0363c20b0468f390f559cb63a7fc70581950f292296cab59d584ff4f21ff468c7528a45f6a0443e53663b2a1676e7444f70858b64d2827e9 SHA512 8c473bab713b7f66683d07cf51fcf431bb9bea192e969755dce2dc99501c56dbc4041c3477b3410c762ecc6b5fd10c045bf24e8fbdccacc64947916343c05896
 DIST pidgin-otr-4.0.2.tar.gz 515627 BLAKE2B e4ee9887d755f27f121c86337df596939eb1ae83ae91d1a396140be27558ee086cca54e2fb7e2337603fc78df00228e8a5759c3adc8b6c68bfdb3f3fa9476163 SHA512 6815f1d2be5786726602a924ae6ead5371543a53bd36231dc3239fa580f73a6136836df0c1beb64d83b76e6bd0d80ffe6750ca6e9ddd2a6a94841a9a678925ad
 EBUILD pidgin-otr-4.0.2-r2.ebuild 722 BLAKE2B b56b0823b46ebff83802d39a9ea4af30910a9641e935821e942f9728e7bcce77cc9092955de9d1d8372b5e4d6028a09a931c6497ee7a606694208997629c9245 SHA512 025098dcd28137de59b336498f8b500feee7d7aa5340fd987689dd93d350434acc3ecfbc972e4a83e0b34ecce017635c4f2a3baa97b5d193164a1c8d595951ec
+EBUILD pidgin-otr-4.0.2-r3.ebuild 857 BLAKE2B 3bfd12ce009df22674245298f7bc5a813a5135eaa99e4893f4aed63d301af2606d591c6768f053dc4f6007b476a91baff7885a876bc5252c3fd742dfa3f8ed58 SHA512 aa2e797faa7dae2974e68e00a3073124be0b3f3e33f69f9055b0cb31fe70a9c8be718b4d9389100593fa552f405178056d2687d64171cd4a85d4ca8bf3c71d86
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch
new file mode 100644
index 000000000000..e630185cc45f
--- /dev/null
+++ b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch
@@ -0,0 +1,21 @@
+Don't clobber our toolchain defaults.
+
+https://bugs.gentoo.org/898526
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,7 +141,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
+ ])], have_clang=yes, have_clang=no)
+ 
+ if test x$enable_gcc_hardening != xno; then
+-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
++    CFLAGS="$CFLAGS"
+     if test x$have_clang = xyes; then
+        OTR_CHECK_CFLAGS(-Qunused-arguments)
+     fi
+@@ -166,4 +166,6 @@ if test x$enable_linker_hardening != xno; then
+     OTR_CHECK_LDFLAGS(-z relro -z now, "$all_ldflags_for_check", "$all_libs_for_check")
+ fi
+ 
++AX_ADD_FORTIFY_SOURCE
++
+ AC_OUTPUT([Makefile po/Makefile.in])
diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild
new file mode 100644
index 000000000000..f1d7ce738b0f
--- /dev/null
+++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE="http://www.cypherpunks.ca/otr/"
+SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/libgcrypt:0
+	net-im/pidgin[gtk]
+	>=net-libs/libotr-4.0.0
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+# autoconf-archive for F_S patch
+BDEPEND="
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.2-dont-clobber-fortify-source.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}