gentoo resync : 03.12.2017

3 files changed, 61 insertions, 9 deletions

diff --git a/x11-misc/easystroke/Manifest b/x11-misc/easystroke/Manifest
index 3a27dbde3058..9886c663e74d 100644
--- a/x11-misc/easystroke/Manifest
+++ b/x11-misc/easystroke/Manifest
@@ -1,10 +1,11 @@
+AUX easystroke-0.6.0-abs.patch 1246 BLAKE2B 3fe3e984d8119198de364d4b65adc6368cf2ba94a5744878bc52c9949488304b2804ac5cf835a1a0cc77d4323778eed91310e3827b9797b4bc4020477e753116 SHA512 80596ce9fa22e880f7e41dd3574513005252fa1f2c74eb53ab7e1d3cbcd973a4bf35cdc76bfd9770a161551209cbb78677b572410a36cdc5c9075a601a809ae0
 AUX easystroke-0.6.0-buttons-scroll-send.patch 1431 BLAKE2B bba629d5d54c3544bb1564474812521587ef05c9ecaedce51dcecacf74e263602095e0e64f1961bb67c5640e3a86eca7369f46c5aabf82a919f4563bf25c7f89 SHA512 f8a862c450c665db4409d9abb07687fac5fac182a8f36038c795eb25a0cf732e0ccc3e589ae6c6eb65bde9a4f4cbd680f267734d2a65b301d1c8e7fa078dfcff
 AUX easystroke-0.6.0-cellrendertextish.patch 718 BLAKE2B 98856aa9e0cb70ffa0fb28f429a714f4caa732c18d4e16143fa2d63bf3f1ab70bf2329bb4eabccd1249e1bd09a435d37e18109bf0edfb0e9e6ced712fbe088a1 SHA512 2feacef4d9b1707dd1e20a2e84b78313744bc9ce9b2a7d0070cab47b691ec2cfd1e1616aaf1c30a722ae5ecb16c230b6a647965da4194f2700262977eedb8b9f
 AUX easystroke-0.6.0-cxx11.patch 748 BLAKE2B c6dd91ac07693d26c79c75c4cd323a9c3158e999bd34e2e034c1e0b05be845d224a8e412e4cdddde95f4aaba1906c4b157d72f83ce2a69f33b4e0a55c1957c5d SHA512 e16229a595dbad028665b967b8ee7a3c27860fa33e3fc3a40e2e7657e5d69338bde571f8526431ec1044ad59f1aaf65f66e294f38d735d932a7386a19d8f55a5
 AUX easystroke-0.6.0-desktop.patch 294 BLAKE2B 090d292720cb8168896b57011369a42ca9d32e805a19ed21bdca45023f64eedf5e06c2618dfc954a3d40d5f8476555837c64e0c3137b414b95de3925d4fa9504 SHA512 082b353b21fdb7754a3b94519a426f69c67caca32977657bdc09ca158d783612a454b2fc08949cb9cb2ee2d1c3ce07d6f7915e782f50c3829f456e31f6330471
 AUX easystroke-0.6.0-gentoo.patch 1672 BLAKE2B 5ba245c95108e3f8025f371165dac2256c0bcefbdf20024b722fb97c2634840398e38c7d8c171d84f8357c81c2d31aee6b6ffdd7ba7448aa77825a87d4ff68d8 SHA512 e44b7d01506242985ec2b53d4f267425d7877649d4ca734ade93a68b9d52b03af1cf7fc9eab81617d2459cbe27eb88f4f82754416a910fc01e1b0de9b34486a8
 AUX easystroke-0.6.0-reinstate-signal-handlers.patch 1070 BLAKE2B c994676a92954c90f093ba1b466a2c8bdf42846b3df3d7547852fdc4f23edeee95d259c969b70006ac86934b290c5b649afa86e25b96d2445e1fd36bdd5c454a SHA512 9cfe216ecfc2148e22d2a91f25b294bde2f7933e912f2ede86002679763e0a6eb14bb3f1182fd07156d103baa4bef4434e45b27ae3753c31758524c680665572
-DIST easystroke-0.6.0.tar.gz 121358 SHA256 f4c37adbc4dd405a24badb9e6be20d3223b4087ff9caed2c15ff71674051d0fd SHA512 a74cbdfd2b56e6b20d895297e80fb63f3d8ac938235ecf7067f984d087004af22a5ea0116ae20b948e238b02a06b14044a7025d65840f0c8d00542332387c921 WHIRLPOOL d1305449563d599c5159ebddb2fdc6c17f2e79d8a1ea5186cff9f6785545cb2941413fb498347da8801ac665e20f1aa252270bcc88e93d97111ae253924d7b18
-EBUILD easystroke-0.6.0-r1.ebuild 1283 BLAKE2B 5309d050a58799d973408919a2d0ff9f63aa2a31947423db9a800a524e1d0d71e7a59fb4f65ee3ba2b6f10f3590f627bfc8774c4262fe69a75f3b4129afaffbc SHA512 83f13dc4f3609583502d9fd9abc91ad90ff525e9c811e5fa638eb5f51ba5edc0cf65c1c88d5f41f25beea5d2e416a4ddb1e1f12698afbbda3f60973561e9f6c8
+DIST easystroke-0.6.0.tar.gz 121358 BLAKE2B 9a4bec134f44620b10e1af9959ac4d82cb0a7ae8ea1e33ebfdafd2bb8367b7f431e48be4386803dc498b30f11a51b448570331d544fe089523ae710ffa8625ce SHA512 a74cbdfd2b56e6b20d895297e80fb63f3d8ac938235ecf7067f984d087004af22a5ea0116ae20b948e238b02a06b14044a7025d65840f0c8d00542332387c921
 EBUILD easystroke-0.6.0-r2.ebuild 1363 BLAKE2B f40accfa800a595ff394ebdce670c155dbc6f778ff5735b545ec4e9ae06c420de54226f4778754fcba2fb6886dc4f329744a274cd4f12d9170ba84c9d8181fd0 SHA512 f8bb6743ca4730c6793d6b1f0cb3468690dbb63411af6b2b7f1551cdaa2e490903476e2eaaf806bb4ec512b3062e53dc9bfe02770b4a3b6050dc60d62ce811df
+EBUILD easystroke-0.6.0-r3.ebuild 1372 BLAKE2B 3c3b14f28d1aee38308e400e6c7c0e31ded8629687eaedaf15f92460ee51454a1c3090c8096ec3dc3a88d0dd62eb385075bb400e3e05e92a7485974b1c0f9fca SHA512 86e7b00e06fb5852db10e505f6ae463bb205ac09bde03b20b32be15b59f7929be19ce9865f7043cc79a773a05df0c7103a4c16cd37573ac16e50e2eb556eab29
 MISC metadata.xml 356 BLAKE2B 42a37fbf9d232be3f38590938039d1117f2ac480c5e3c3973e56cf3fa726045ddbffe64086b864201863df267306be23ce9bcfc12ec2dc2ff9797aba04a0d46a SHA512 c5efb2bf236919918bdd4ec562db67ac68c243c4ce208460a95faad9ba94325036ae101d01b06cd95b5cda300695b8fd27b3d6b39d9af41685b7c30652e89ffc
diff --git a/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild
index f7399bbec905..74b40179af2b 100644
--- a/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild
+++ b/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="a gesture-recognition application for X11"
 HOMEPAGE="https://sourceforge.net/apps/trac/easystroke/"
@@ -29,13 +29,18 @@ DEPEND="
 	dev-util/intltool
 	sys-devel/gettext
 "
+PATCHES=(
+	"${FILESDIR}"/${P}-cellrendertextish.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-reinstate-signal-handlers.patch
+	"${FILESDIR}"/${P}-buttons-scroll-send.patch
+	"${FILESDIR}"/${P}-cxx11.patch
+	"${FILESDIR}"/${P}-abs.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cellrendertextish.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-reinstate-signal-handlers.patch
-	epatch "${FILESDIR}"/${P}-buttons-scroll-send.patch
+	default
 
 	tc-export CC CXX PKG_CONFIG
 
@@ -51,6 +56,7 @@ src_prepare() {
 }
 
 src_compile() {
+	append-cxxflags -std=c++11
 	emake \
 		AOFLAGS='' \
 		LDFLAGS="${LDFLAGS}" \
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch b/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch
new file mode 100644
index 000000000000..9b4ab63828db
--- /dev/null
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch
@@ -0,0 +1,45 @@
+--- a/handler.cc
++++ b/handler.cc
+@@ -533,7 +533,7 @@
+ 	virtual Grabber::State grab_mode() { return parent->grab_mode(); }
+ };
+ 
+-static inline float abs(float x) { return x > 0 ? x : -x; }
++static inline float easystroke_abs(float x) { return x > 0 ? x : -x; }
+ 
+ class AbstractScrollHandler : public Handler {
+ 	bool have_x, have_y;
+@@ -559,7 +559,7 @@
+ 			xstate->fake_click(b2);
+ 	}
+ 	static float curve(float v) {
+-		return v * exp(log(abs(v))/3);
++		return v * exp(log(easystroke_abs(v))/3);
+ 	}
+ protected:
+ 	void move_back() {
+@@ -597,8 +597,8 @@
+ 		offset_x += factor * curve(dx/dt)*dt/20.0;
+ 		offset_y += factor * curve(dy/dt)*dt/10.0;
+ 		int b1 = 0, n1 = 0, b2 = 0, n2 = 0;
+-		if (abs(offset_x) > 1.0) {
+-			n1 = (int)floor(abs(offset_x));
++		if (easystroke_abs(offset_x) > 1.0) {
++			n1 = (int)floor(easystroke_abs(offset_x));
+ 			if (offset_x > 0) {
+ 				b1 = 7;
+ 				offset_x -= n1;
+@@ -607,10 +607,10 @@
+ 				offset_x += n1;
+ 			}
+ 		}
+-		if (abs(offset_y) > 1.0) {
+-			if (abs(offset_y) < 1.0)
++		if (easystroke_abs(offset_y) > 1.0) {
++			if (easystroke_abs(offset_y) < 1.0)
+ 				return;
+-			n2 = (int)floor(abs(offset_y));
++			n2 = (int)floor(easystroke_abs(offset_y));
+ 			if (offset_y > 0) {
+ 				b2 = 5;
+ 				offset_y -= n2;