From 4fc1e8ada0799f72570e3c362af703dc17f81650 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 14 Apr 2017 18:24:20 +0200
Subject: [PATCH] Revert "sys-devel/make: default CXX to c++ instead of g++,
 #589894"

The change was accidentally done to the stable ebuild. Will reland
with ~arch revbump.

Reverts: bace4a893fbf789675d576be2a291aef33db90f5
---
 sys-devel/make/files/make-4.2-default-cxx.patch     | 13 -------------
 .../{make-4.2.1-r1.ebuild => make-4.2.1.ebuild}     |  1 -
 2 files changed, 14 deletions(-)
 delete mode 100644 sys-devel/make/files/make-4.2-default-cxx.patch
 rename sys-devel/make/{make-4.2.1-r1.ebuild => make-4.2.1.ebuild} (96%)

diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch
deleted file mode 100644
index 4d592086a6ff..000000000000
--- a/sys-devel/make/files/make-4.2-default-cxx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/default.c b/default.c
-index 3d865c7..e8b3ed6 100644
---- a/default.c
-+++ b/default.c
-@@ -530,7 +530,7 @@ static const char *default_variables[] =
-     "OBJC", "gcc",
- #else
-     "CC", "cc",
--    "CXX", "g++",
-+    "CXX", "c++",
-     "OBJC", "cc",
- #endif
- 
diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1.ebuild
similarity index 96%
rename from sys-devel/make/make-4.2.1-r1.ebuild
rename to sys-devel/make/make-4.2.1.ebuild
index 17448b34b987..70e90b6bf623 100644
--- a/sys-devel/make/make-4.2.1-r1.ebuild
+++ b/sys-devel/make/make-4.2.1.ebuild
@@ -22,7 +22,6 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
-	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
 )
 
 src_prepare() {
-- 
2.26.2