gentoo resync : 21.07.2018

4 files changed, 52 insertions, 6 deletions

diff --git a/x11-plugins/wmail/Manifest b/x11-plugins/wmail/Manifest
index e16e675872cd..02e37a180f20 100644
--- a/x11-plugins/wmail/Manifest
+++ b/x11-plugins/wmail/Manifest
@@ -1,5 +1,6 @@
-AUX wmail-2.0.maildir-parse-from.patch 325 BLAKE2B 5f20b7f90a0cd09a4f49f7dee36399d8c9a1a7624a6f326a4f21f20f4f541d59f4fcdb2e53cf94908a15f8eee6aab640b45c9b5d8d01aeaed737d15e692e57b6 SHA512 fd5dab53aebf8e1e50c740b09fcb66eb74a9146b7c589b76c09544f90e28d134912617ff96fceaf297e650da4f0f08ec9c3363abd64f29ae1cf5f014b8dc4862
-AUX wmail-2.0.support-libdockapp-0.5.0.patch 1026 BLAKE2B 5156ae7d5ae67aa36dbab6ab394aa5fd7c9aea89401a2a7a724ce1f1e6bc1862ba97f6df820ef65655e827a9bfe966e245158ab6ba0e24e9ce0ed4f881a1c035 SHA512 672f97466c02161e000432fb0bd9507240a4a4d2ddf109ad342c7a25fab4ff5e0ef35fafac4440c9becc63f829a752c1ecaedd59304274f66523aa1019391770
+AUX wmail-2.0.maildir-parse-from.patch 325 BLAKE2B 6a4c6c551e54494826d14806d03bdacf72250a1d4ad9659a9658895cc1e1a22be80b4898693fb5201cf37393850c3e3025f78d172cec1e7bbe3234b4ae980d68 SHA512 8ad5ac85e8249d330cda20cb1c8a260ef560894f0baafefa04eb56e348034b1cf828a107de3ef412a7cc6443f3e25be186c180ebfa0cd24f345190f89012aead
+AUX wmail-2.0.support-libdockapp-0.5.0.patch 1030 BLAKE2B cd65fd05ddef1024cffdf58e20b06c902c5704e30381caba0b321bdf022f51cb322b01cb48d03e755e02da3d6c991e7b8e043ede3340a25faf0bfc4250e311a8 SHA512 af6b44e48063fc5c671602a53d3c4637564ae08e6e4c7f273aa2eca881c6bb3098f26958ca59f320cc7707f5adeb8d46e1ea2249b19e991c343d16eca0906005
 DIST wmail-2.0.tar.gz 46468 BLAKE2B 316743065f72e14339e4c7d9bc1d394d0f5ccfa5772efd94856bef184fa3a60a1892c510f07655dacbf0b470492e085e413dcb29e3ec166c5d1a1f03d388636e SHA512 62ca761619af006221ac64003246b8d7b0dacee65cd4dd6a5c31e6fc152f9f97646ceb7e757bd81333a792c73280479591dc24bb29f9da2023f2927ec2827039
 EBUILD wmail-2.0-r4.ebuild 1070 BLAKE2B eb9fe03f5c2e73245be81005815c6e3b725261f15f0a3bbe608270f43cf22eb2f3cf40abbd6ecb99738b08c03a2cfa9c219e2a70ce9b10cc8922b40a15650322 SHA512 b6b366456b803c602bd09f3682d035d59df6246d20bb04338a4f251c9ca84788ed4fd19431458a3a78af3771f166180e71d7762a3c180189d0e12bf0a69030d9
+EBUILD wmail-2.0-r5.ebuild 1091 BLAKE2B 998f4c6d66624a4a6c561a3b0af151e3e883afd9aba535277f98ab68e8e69da86b35627b46b81a7a4d606161ac373f62bea575bcb137d9703b353dfbac13aa0f SHA512 0c14d653c250e1486805958c1f9686d2cf5ddc98cdcd0518dc5b1405c0a156a38596b5483f65ee0f1b856c3fdd9a156030aedfbb81293060018c6bad545fb9c5
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmail/files/wmail-2.0.maildir-parse-from.patch b/x11-plugins/wmail/files/wmail-2.0.maildir-parse-from.patch
index c39329286a57..abdfd489412e 100644
--- a/x11-plugins/wmail/files/wmail-2.0.maildir-parse-from.patch
+++ b/x11-plugins/wmail/files/wmail-2.0.maildir-parse-from.patch
@@ -1,5 +1,5 @@
---- src/wmail.c	2007-01-26 19:17:08.000000000 +0100
-+++ src/wmail.c.new	2007-01-26 19:17:02.000000000 +0100
+--- a/src/wmail.c	2007-01-26 19:17:08.000000000 +0100
++++ b/src/wmail.c	2007-01-26 19:17:02.000000000 +0100
 @@ -871,6 +871,9 @@
  			InsertName( ParseFromField( buf+6 ), checksum,
  						isNewMail ? FLAG_INITIAL : FLAG_READ );
diff --git a/x11-plugins/wmail/files/wmail-2.0.support-libdockapp-0.5.0.patch b/x11-plugins/wmail/files/wmail-2.0.support-libdockapp-0.5.0.patch
index b9202b36d3f4..593cf640b7e1 100644
--- a/x11-plugins/wmail/files/wmail-2.0.support-libdockapp-0.5.0.patch
+++ b/x11-plugins/wmail/files/wmail-2.0.support-libdockapp-0.5.0.patch
@@ -1,5 +1,5 @@
---- configure	2002-08-12 22:59:48.000000000 +0200
-+++ configure	2004-08-31 15:42:52.979115744 +0200
+--- a/configure	2002-08-12 22:59:48.000000000 +0200
++++ b/configure	2004-08-31 15:42:52.979115744 +0200
 @@ -2386,8 +2386,8 @@
  fi
  
diff --git a/x11-plugins/wmail/wmail-2.0-r5.ebuild b/x11-plugins/wmail/wmail-2.0-r5.ebuild
new file mode 100644
index 000000000000..6075abff09ae
--- /dev/null
+++ b/x11-plugins/wmail/wmail-2.0-r5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Window Maker dock application showing incoming mail"
+HOMEPAGE="https://www.dockapps.net/wmail"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:="
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}.support-libdockapp-0.5.0.patch
+
+	# make from parsing in maildir format faster, thanks
+	# to Stanislav Kuchar
+	eapply "${FILESDIR}"/${P}.maildir-parse-from.patch
+
+	# fix LDFLAGS ordering, see bug #248620
+	sed -i 's/$(LIBS) -o $@ $^/-o $@ $^ $(LIBS)/' "${S}/src/Makefile.in" || die
+
+	# Honour Gentoo LDFLAGS, see bug #337407
+	sed -i 's/-o $@ $^ $(LIBS)/$(LDFLAGS) -o $@ $^ $(LIBS)/' "${S}/src/Makefile.in" || die
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i src/*.c || die
+}
+
+src_configure() {
+	econf --enable-delt-xpms
+}
+
+src_compile(){
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin src/wmail
+	dodoc README wmailrc-sample
+}