gentoo resync : 30.05.2020

5 files changed, 80 insertions, 1 deletions

diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index a3f2ff50ede4..c5484c6f9aba 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -1,4 +1,7 @@
+AUX mboxgrep-0.7.9-_DEFAULT_SOURCE.patch 402 BLAKE2B d517138fd5b6a50846886705f0663483dbcfc7e7b347808bc3e88e8b7f1962069bf6a2be84736b328deb965aaeab3d7c33fa3dc1d3c62e92832a3ebc109449cd SHA512 121d63057e3e18520d1a9d799102116a2894c5cd5ea65d6aa6142313f7da712c998ca316639f4f896c255aae6f2fafff565176ebac6298700b57fb6f41d62664
+AUX mboxgrep-0.7.9-fno-common.patch 301 BLAKE2B f509ad202b6f82afe7d4ef71686198a382fd34bf94ce01753f7db6caaf1a1a1af8ca63682a329de3afc16885a4e0676eddd886227869fda4971cd383ffef783d SHA512 8208a760372f94562ed118e0a7b65a0d7c58291aba5898bd4b951acfddf001f076fea4cf3cae253fba298481e4d684645eca5772bdd71606228d0d06c2c68441
 AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
 DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
 EBUILD mboxgrep-0.7.9-r1.ebuild 561 BLAKE2B d3e18ee1d573f6d9187d1897c0d28c4d4a9b31217a4f0c3baa723a250482c2b371fda8c01d95c13c22feec8796d3dcedf919046f831d68efb30d4b826ef53b53 SHA512 ebbb369bcd0974941e37c657b1d3e943e10436538bd35b5058f4ee9a6b0f7653851be962675e89da9f7258664f6aacb3cbfac718615dcfc616a4d508d821c4ca
-MISC metadata.xml 245 BLAKE2B 4b93589a8a73efb60967e4ba0102a586cd02498c0deeeeecc02dca9b11feddfe6842b90d19157d74daf909d124161b73f10f12f46ec4e2989dd2648b6b703c70 SHA512 bcd6489344b1d3d87ddea6a9a7ea086bc2cb3e22c6c3697e408c7df6818cf41abd2f5365dacd91fd4f5e66638b32e4ddd51604ee273ee5adfb7eb4e60f44d867
+EBUILD mboxgrep-0.7.9-r2.ebuild 770 BLAKE2B 4c033bf6d0e4d46062aadd5552f1ba5a60565686948fbc676dcc8ad9a7e2cdc6e409f812a9404fab1c66fe2a5a70210047a3f430389173c1260a31961d19e099 SHA512 cee11e03166ebd31eb8b7ab42396ddb5c584ab212133ba56f6575cfc1db06030007cf07ebd37595ca99d83ca933943b12eae150ac88051ea28b60a5c41fdb1a6
+MISC metadata.xml 337 BLAKE2B 278e5cc4a7081de0b6f8cbbba8f25d762014c869676683b41dcd74a1fb9ec8bdf73d412652dc867117204ce9d509a6a79f496aa22e69a65f234e4323f8059a14 SHA512 ab0f3ce2bfd3a959ef8132b4ad3b578cc71e3714002ec7433ff68084926176792eca1b319062878fbe984487514324d228b3d75065ae13747e1b22f1aa898d72
diff --git a/net-mail/mboxgrep/files/mboxgrep-0.7.9-_DEFAULT_SOURCE.patch b/net-mail/mboxgrep/files/mboxgrep-0.7.9-_DEFAULT_SOURCE.patch
new file mode 100644
index 000000000000..fe7ffec2d578
--- /dev/null
+++ b/net-mail/mboxgrep/files/mboxgrep-0.7.9-_DEFAULT_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -19,7 +19,7 @@
+   $Id: misc.c,v 1.13 2003/04/06 21:01:49 dspiljar Exp $ */
+ 
+ #define _XOPEN_SOURCE  /* Pull in strptime(3) from time.h */
+-#define _BSD_SOURCE    /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
++#define _DEFAULT_SOURCE    /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
+                         * from string.h. */
+ 
+ #include <config.h>
diff --git a/net-mail/mboxgrep/files/mboxgrep-0.7.9-fno-common.patch b/net-mail/mboxgrep/files/mboxgrep-0.7.9-fno-common.patch
new file mode 100644
index 000000000000..09c8388998cb
--- /dev/null
+++ b/net-mail/mboxgrep/files/mboxgrep-0.7.9-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/mboxgrep.h
++++ b/src/mboxgrep.h
+@@ -129,6 +129,6 @@
+ }
+ option_t;
+ 
+-option_t config;
++extern option_t config;
+ 
+ #endif /* MBOXGREP_H */
+--- a/src/main.c
++++ b/src/main.c
+@@ -57,6 +57,7 @@
+ int count = 0;
+ void *tmpp;
+ checksum_t *cs;
++option_t config;
+ 
+ int
+ main (int argc, char **argv)
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
new file mode 100644
index 000000000000..5e42763bd887
--- /dev/null
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Grep for mbox files"
+SRC_URI="mirror://sourceforge/mboxgrep/${P}.tar.gz"
+HOMEPAGE="https://datatipp.se/mboxgrep/"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dmalloc"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libpcre
+	sys-libs/zlib
+	dmalloc? ( dev-libs/dmalloc )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_configure() {
+	econf \
+		$(use_with dmalloc no yes)
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		install
+	dodoc ChangeLog NEWS TODO README
+}
diff --git a/net-mail/mboxgrep/metadata.xml b/net-mail/mboxgrep/metadata.xml
index dff8618ac7eb..63436f59f911 100644
--- a/net-mail/mboxgrep/metadata.xml
+++ b/net-mail/mboxgrep/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+<use>
+<flag name='dmalloc'>Enable debugging using <pkg>dev-libs/dmalloc</pkg></flag>
+</use>
 	<upstream>
 		<remote-id type="sourceforge">mboxgrep</remote-id>
 	</upstream>