gentoo resync : 16.06.2018

4 files changed, 48 insertions, 7 deletions

diff --git a/x11-plugins/wmfortune/Manifest b/x11-plugins/wmfortune/Manifest
index 8f88b3b7c51d..7952c1c8c6c9 100644
--- a/x11-plugins/wmfortune/Manifest
+++ b/x11-plugins/wmfortune/Manifest
@@ -1,4 +1,5 @@
-AUX wmfortune-0.241-stringh.patch 382 BLAKE2B e8772171211d5ce4ee56d18a340a86ab42675ccaf6448462f58de87e916350ca10cfb1a0f2f8e3b96f56e22c9927f354575603a68069bc97bd1c5f1802dbdc33 SHA512 ff03a7473f3dcb45a882f3298d04830253f9d2b88466b2e8201f0c2bd96fce979c70c184446e35b665b41a173c7fb494423001b7a7208c4d5c7d993fd928d0b0
+AUX wmfortune-0.241-stringh.patch 316 BLAKE2B 3c045766680c8581a4d8e4d312863e7b158d3e840000e9c767d8fa40c2c898be763ecd7b8ddf76e35a14fe99fed3734f0a84fe69d6102a38c993279e6f53c122 SHA512 8b4982a59604110800506d10ad10ef95964d8281a439506437c8311836aff4daa250aac9208e4f7e105cafee167acbec4d3e8631fed4d6c3a94277b338604025
 DIST wmfortune-0.241.tar.gz 23406 BLAKE2B 2a104d4f5d9ca1865618b95c2d6e4bb49cb841325442f58712c4bca1d971b9ef6512d509e80753b8a96e7978d5198b3a4f6fc2d54c6182b439b4d30cbe73d6df SHA512 d5640090c2f2ba788ab9367b70d948d4f1d846174714e2415e81500f5fef6c3e7e81b12575274bdb3a760fa3e2e9ab499880713a923add136089969b394f9409
-EBUILD wmfortune-0.241.ebuild 856 BLAKE2B 0769a4a43c84aff52d2e40f5a99d2db6112d0cdb8098db2e27e19dae8d5242c219f0fb9e85f27047c30f302f36c5641d9178ffd9814434947d80873ede2ca27f SHA512 49b0b26b2a3987f1a3a0fc40fd7aeb54ae97d7c2c33afe7f883a23adb14a36d59d15a303121ef2a0b127654b925350c6325e8d6045c7d05376062e68d17c6702
+EBUILD wmfortune-0.241-r1.ebuild 805 BLAKE2B 79e14e6c8b39f058f2d81e3e77be80027d60253045d51f7ff8a60f7164f33c85c5b73425a6ab18ced3aae8dd62d9473edc4c1042a352106a81a777b53dc64346 SHA512 e73842227c562f33d17de186a8aadb4d4b1d79e900e7d1e44aff7ddc00123230f7b9a7e1be61d42f18dab6a7b5e8eca196cd62ff9fd602b9e41b9838e680da38
+EBUILD wmfortune-0.241.ebuild 858 BLAKE2B d3d381158f20297d56a5c8aa2b0ba803de51bff7befcf34a8747da87a4edc0833bdb93fa175865d0bc4ab341f8ad90fbe76bf2edc921113bd55e93bb7aa04887 SHA512 a4aa8c41f1e0314095f49bb1f544e605aa762c70676757e745bab0f6deb5b1a447d492b8394c6897f9c2425b7c8f43bab70663d51f1d675fa1024b58d9bcba3f
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmfortune/files/wmfortune-0.241-stringh.patch b/x11-plugins/wmfortune/files/wmfortune-0.241-stringh.patch
index a8e9f9ff6eda..35db475df300 100644
--- a/x11-plugins/wmfortune/files/wmfortune-0.241-stringh.patch
+++ b/x11-plugins/wmfortune/files/wmfortune-0.241-stringh.patch
@@ -1,6 +1,6 @@
-diff -ur wmfortune-0.241.orig/wmfortune.c wmfortune-0.241/wmfortune.c
---- wmfortune-0.241.orig/wmfortune.c	2001-09-01 03:25:39.000000000 +0300
-+++ wmfortune-0.241/wmfortune.c	2008-01-15 10:21:17.000000000 +0200
+diff -ur a/wmfortune.c b/wmfortune.c
+--- a/wmfortune.c	2001-09-01 03:25:39.000000000 +0300
++++ b/wmfortune.c	2008-01-15 10:21:17.000000000 +0200
 @@ -25,6 +25,7 @@
  
  #include <unistd.h>
diff --git a/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild b/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
new file mode 100644
index 000000000000..f67de2f9282a
--- /dev/null
+++ b/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp showing fortune-mod messages"
+HOMEPAGE="https://www.dockapps.net/wmfortune"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="games-misc/fortune-mod
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=( "${FILESDIR}"/${P}-stringh.patch )
+
+src_prepare() {
+	# Honour Gentoo LDFLAGS. Closes bug #336446.
+	sed -i 's/-o $(DEST)/$(LDFLAGS) -o $(DEST)/' Makefile || die
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" \
+		XLIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+}
diff --git a/x11-plugins/wmfortune/wmfortune-0.241.ebuild b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
index 4165e7e95b94..f4d577617bb1 100644
--- a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
@@ -6,8 +6,8 @@ EAPI=0
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="a dockapp showing fortune-mod messages"
-HOMEPAGE="http://www.dockapps.net/wmfortune"
-SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
+HOMEPAGE="https://www.dockapps.net/wmfortune"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"