3 files changed, 58 insertions, 39 deletions
diff --git a/dev-libs/libglibutil/files/libglibutil-1.0.67-r3-respect-env.patch b/dev-libs/libglibutil/files/libglibutil-1.0.67-r3-respect-env.patch
new file mode 100644
index 000000000..14ee2b182
--- /dev/null
+++ b/dev-libs/libglibutil/files/libglibutil-1.0.67-r3-respect-env.patch
@@ -0,0 +1,57 @@
+diff --git a/Makefile b/Makefile
+index 3e9aa23..071620e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,20 +80,20 @@ FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \
+   -MMD -MP $(shell pkg-config --cflags $(PKGS))
+ FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) \
+   $(shell pkg-config --libs $(PKGS))
+-DEBUG_FLAGS = -g
++DEBUG_FLAGS = 
+ RELEASE_FLAGS =
+-COVERAGE_FLAGS = -g
++COVERAGE_FLAGS = 
+ 
+ KEEP_SYMBOLS ?= 0
+ ifneq ($(KEEP_SYMBOLS),0)
+-RELEASE_FLAGS += -g
++#RELEASE_FLAGS += -g
+ endif
+ 
+ DEBUG_LDFLAGS = $(FULL_LDFLAGS) $(DEBUG_FLAGS)
+ RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_FLAGS)
+-DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG
+-RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2
+-COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS) --coverage
++DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS)
++RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS)
++COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS)
+ 
+ #
+ # Files
+@@ -119,11 +119,11 @@ COVERAGE_STATIC_LIB = $(COVERAGE_BUILD_DIR)/$(STATIC_LIB)
+ #
+ 
+ DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d) $(COVERAGE_OBJS:%.o=%.d)
+-ifneq ($(MAKECMDGOALS),clean)
+-ifneq ($(strip $(DEPS)),)
+--include $(DEPS)
+-endif
+-endif
++#ifneq ($(MAKECMDGOALS),clean)
++#ifneq ($(strip $(DEPS)),)
++#-include $(DEPS)
++#endif
++#endif
+ 
+ $(PKGCONFIG): | $(BUILD_DIR)
+ $(DEBUG_OBJS) $(DEBUG_LIB) $(DEBUG_STATIC_LIB): | $(DEBUG_BUILD_DIR)
+@@ -191,7 +191,7 @@ $(DEBUG_LIB): $(DEBUG_OBJS)
+ $(RELEASE_LIB): $(RELEASE_OBJS)
+ 	$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
+ ifeq ($(KEEP_SYMBOLS),0)
+-	$(STRIP) $@
++#	$(STRIP) $@
+ endif
+ 
+ $(DEBUG_LINK): $(DEBUG_LIB)
diff --git a/dev-libs/libglibutil/files/libglibutil-1.0.67-respect-env.patch b/dev-libs/libglibutil/files/libglibutil-1.0.67-respect-env.patch
deleted file mode 100644
index a68dbdb1a..000000000
--- a/dev-libs/libglibutil/files/libglibutil-1.0.67-respect-env.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 3e9aa23..252bf2c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -84,15 +84,15 @@ DEBUG_FLAGS = -g
- RELEASE_FLAGS =
- COVERAGE_FLAGS = -g
- 
--KEEP_SYMBOLS ?= 0
--ifneq ($(KEEP_SYMBOLS),0)
--RELEASE_FLAGS += -g
--endif
-+#KEEP_SYMBOLS ?= 0
-+#ifneq ($(KEEP_SYMBOLS),0)
-+#RELEASE_FLAGS += -g
-+#endif
- 
- DEBUG_LDFLAGS = $(FULL_LDFLAGS) $(DEBUG_FLAGS)
- RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_FLAGS)
- DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG
--RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2
-+RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS)
- COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS) --coverage
- 
- #
-@@ -190,9 +190,9 @@ $(DEBUG_LIB): $(DEBUG_OBJS)
- 
- $(RELEASE_LIB): $(RELEASE_OBJS)
- 	$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
--ifeq ($(KEEP_SYMBOLS),0)
--	$(STRIP) $@
--endif
-+#ifeq ($(KEEP_SYMBOLS),0)
-+#	$(STRIP) $@
-+#endif
- 
- $(DEBUG_LINK): $(DEBUG_LIB)
- 	ln -sf $(LIB) $@
diff --git a/dev-libs/libglibutil/libglibutil-1.0.67-r2.ebuild b/dev-libs/libglibutil/libglibutil-1.0.67-r3.ebuild
index 543c4438a..0c6db94a0 100644
--- a/dev-libs/libglibutil/libglibutil-1.0.67-r2.ebuild
+++ b/dev-libs/libglibutil/libglibutil-1.0.67-r3.ebuild
@@ -20,7 +20,7 @@ DEPEND="dev-libs/glib"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 PATCHES=(
-	"${FILESDIR}/libglibutil-1.0.67-respect-env.patch"
+	"${FILESDIR}/libglibutil-1.0.67-r3-respect-env.patch"
 )
 
 src_compile() {