gentoo resync : 02.06.2018

2 files changed, 70 insertions, 0 deletions

diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 7908192e80ed..a3b13060a135 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -3,4 +3,5 @@ AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e863
 DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
 DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
 EBUILD metamail-2.7.53.3-r1.ebuild 1708 BLAKE2B 59c034ab96e4aa4381f0cb43199652a6ada61850abb66c5c2fef7acde31936e0dc45cad96dc4418f311ae049f2af456e16889e1374ffdfed447948b7a9a3d03c SHA512 b7d7ba31683dee40336927bc20c61bbbf716a61f08ff7e06798c8c0b157d5031796c0f5b36ab70b12c935db29d4c90ccfb4bba0bd0332d92215c64c3f2fcd7e4
+EBUILD metamail-2.7.53.3-r2.ebuild 1692 BLAKE2B 032bec0cf3e19cdeac2c97286afae6d4c0ff1d12c24727bc86c7d0f4c733f45bda9b828f5870eb96cad4e6a5fe0437f18b5f64cf8c6c6d4a7ce84da4dabdc780 SHA512 4542ca8108ddcef025c5022798374e2f56562e16ebc6a5415c31d07669a52172f2b61e7e54423a0d9707ec617b727ec8c2ae0de5e40d4160cdf60d31ccf006a7
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
new file mode 100644
index 000000000000..84c02dac00bf
--- /dev/null
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_PV=$(ver_cut 1-2)
+DEB_PV=${MY_PV}-$(ver_cut 3)
+
+DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
+HOMEPAGE="http://ftp.funet.fi/pub/unix/mail/metamail/"
+SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
+	mirror://debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-libs/ncurses
+	app-arch/sharutils
+	net-mail/mailbase"
+RDEPEND="app-misc/mime-types
+	sys-apps/debianutils
+	!app-misc/run-mailcap"
+
+S=${WORKDIR}/mm${MY_PV}/src
+
+src_prepare() {
+	eapply "${WORKDIR}"/metamail_${DEB_PV}.diff
+	eapply "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch
+	eapply "${FILESDIR}"/${P}-glibc-2.10.patch
+
+	# respect CFLAGS
+	sed -i -e 's/CFLAGS/LIBS/' \
+		"${S}"/src/{metamail,richmail}/Makefile.am || die
+
+	# add missing include - QA
+	sed -i -e '/config.h/a #include <string.h>' \
+		"${S}"/src/metamail/shared.c || die
+
+	# Fix building with ncurses[tinfo]
+	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
+		src/richmail/Makefile.am \
+		src/metamail/Makefile.am || die
+
+	eapply_user
+	eautoreconf
+	chmod +x "${S}"/configure
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc CREDITS README
+	rm man/mmencode.1
+	rm man/mailcap.5
+	doman man/* debian/mimencode.1 debian/mimeit.1
+
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}