Fix quoting and CFLAGS with patch from bug 516500 thanks to hasufell.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

3 files changed, 148 insertions, 6 deletions

diff --git a/app-backup/cyphertite/ChangeLog b/app-backup/cyphertite/ChangeLog
index e3b79ecd2a09..dc733893dd10 100644
--- a/app-backup/cyphertite/ChangeLog
+++ b/app-backup/cyphertite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/cyphertite
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/cyphertite/ChangeLog,v 1.2 2014/07/06 15:49:17 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/cyphertite/ChangeLog,v 1.3 2014/07/06 20:43:31 grknight Exp $
+
+*cyphertite-2.0.2-r2 (06 Jul 2014)
+
+  06 Jul 2014; Brian Evans <grknight@gentoo.org> +cyphertite-2.0.2-r2.ebuild,
+  +files/cyphertite-2.0.2-cflags.patch, -cyphertite-2.0.2-r1.ebuild:
+  Fix quoting and CFLAGS with patch from bug 516500 thanks to hasufell.
 
 *cyphertite-2.0.2-r1 (06 Jul 2014)
 
diff --git a/app-backup/cyphertite/cyphertite-2.0.2-r1.ebuild b/app-backup/cyphertite/cyphertite-2.0.2-r2.ebuild
index 2ed943b56f41..938988bb41b2 100644
--- a/app-backup/cyphertite/cyphertite-2.0.2-r1.ebuild
+++ b/app-backup/cyphertite/cyphertite-2.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/cyphertite/cyphertite-2.0.2-r1.ebuild,v 1.1 2014/07/06 15:49:17 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/cyphertite/cyphertite-2.0.2-r2.ebuild,v 1.1 2014/07/06 20:43:31 grknight Exp $
 
 EAPI=5
 
@@ -30,18 +30,18 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	# Fix build system that assumes that modules are installed to the live system
-	epatch "${FILESDIR}/${P}-fix-build.patch"
+	epatch "${FILESDIR}/${P}-fix-build.patch" "${FILESDIR}/${P}-cflags.patch"
 }
 
 src_compile() {
 	# Package has a home grown Makefile system. Make it work for Gentoo
-	emake INCDIR="${S}" WARNFLAGS="-Wall" OPTLEVEL="" DEBUG="" CC=$(tc-getCC) \
-		AR=$(tc-getAR) LOCALBASE="/usr" LIB.LINKSTATIC="" LIB.LINKDYNAMIC=""
+	emake INCDIR="${S}" WARNFLAGS="-Wall" OPTLEVEL="" DEBUG="" CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" LOCALBASE="/usr" LIB.LINKSTATIC="" LIB.LINKDYNAMIC=""
 }
 
 src_install() {
 	# Only the main executable needs to be installed
-	emake -C cyphertite/cyphertite DESTDIR="${D}" LOCALBASE=usr LIBDIR=usr/$(get_libdir) LNFORCE=-s install
+	emake -C cyphertite/cyphertite DESTDIR="${D}" LOCALBASE="usr" LIBDIR="usr/$(get_libdir)" LNFORCE="-s" install
 
 	# Fix up broken man symlinks
 	rm "${D}"usr/share/man/man1/ct*.1 || die
diff --git a/app-backup/cyphertite/files/cyphertite-2.0.2-cflags.patch b/app-backup/cyphertite/files/cyphertite-2.0.2-cflags.patch
new file mode 100644
index 000000000000..66d35b294d9e
--- /dev/null
+++ b/app-backup/cyphertite/files/cyphertite-2.0.2-cflags.patch
@@ -0,0 +1,136 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Jul  6 16:27:32 UTC 2014
+Subject: respect CFLAGS in linking commands
+
+--- cyphertite-2.0.2/exude/GNUmakefile
++++ cyphertite-2.0.2/exude/GNUmakefile
+@@ -65,7 +65,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(LIB.SHARED): $(LIB.SOBJS)
+-	$(CC) $(LDFLAGS.SO) $^ $(LIB.LDFLAGS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS.SO) $^ $(LIB.LDFLAGS) -o $@
+ 
+ $(OBJPREFIX)$(LIB.STATIC): $(LIB.OBJS)
+ 	$(AR) $(ARFLAGS) $@ $^
+--- cyphertite-2.0.2/clog/GNUmakefile
++++ cyphertite-2.0.2/clog/GNUmakefile
+@@ -94,7 +94,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(LIB.SHARED): $(LIB.SOBJS)
+-	$(CC) $(LDFLAGS.SO) $^ $(LIB.LDFLAGS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS.SO) $^ $(LIB.LDFLAGS) -o $@
+ 
+ $(OBJPREFIX)$(LIB.STATIC): $(LIB.OBJS)
+ 	$(AR) $(ARFLAGS) $@ $^
+--- cyphertite-2.0.2/shrink/libshrink/GNUmakefile
++++ cyphertite-2.0.2/shrink/libshrink/GNUmakefile
+@@ -85,7 +85,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(LIB.SHARED): $(LIB.SOBJS)
+-	$(CC) $(LDFLAGS.SO) $(LIB.LDFLAGS) -o $@ $^ $(LIB.LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS.SO) $(LIB.LDFLAGS) -o $@ $^ $(LIB.LDLIBS)
+ 
+ $(OBJPREFIX)$(LIB.STATIC): $(LIB.OBJS)
+ 	$(AR) $(ARFLAGS) $@ $^
+--- cyphertite-2.0.2/assl/GNUmakefile
++++ cyphertite-2.0.2/assl/GNUmakefile
+@@ -80,7 +80,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(LIB.SHARED): $(LIB.SOBJS)
+-	$(CC) $(LDFLAGS.SO) $^ $(LIB.LDFLAGS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS.SO) $^ $(LIB.LDFLAGS) -o $@
+ 
+ $(OBJPREFIX)$(LIB.STATIC): $(LIB.OBJS)
+ 	$(AR) $(ARFLAGS) $@ $^
+--- cyphertite-2.0.2/xmlsd/GNUmakefile
++++ cyphertite-2.0.2/xmlsd/GNUmakefile
+@@ -93,7 +93,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(LIB.SHARED): $(LIB.SOBJS)
+-	$(CC) $(LDFLAGS.SO) $^ $(LIB.LDFLAGS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS.SO) $^ $(LIB.LDFLAGS) -o $@
+ 
+ $(OBJPREFIX)$(LIB.STATIC): $(LIB.OBJS)
+ 	$(AR) $(ARFLAGS) $@ $^
+--- cyphertite-2.0.2/shrink/shrink/GNUmakefile
++++ cyphertite-2.0.2/shrink/shrink/GNUmakefile
+@@ -62,7 +62,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(BIN.NAME): $(BIN.OBJS)
+-	$(CC) $(BIN.LDFLAGS) -o $@ $^ $(BIN.LDLIBS)
++	$(CC) $(CFLAGS) $(BIN.LDFLAGS) -o $@ $^ $(BIN.LDLIBS)
+ 
+ $(OBJPREFIX)%.o: %.c
+ 	@echo "Generating $@.depend"
+--- cyphertite-2.0.2/cyphertite/examples/ct_archive/GNUmakefile
++++ cyphertite-2.0.2/cyphertite/examples/ct_archive/GNUmakefile
+@@ -71,7 +71,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(BIN.NAME): $(BIN.OBJS)
+-	$(CC) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
++	$(CC) $(CFLAGS) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
+ 
+ 
+ $(OBJPREFIX)%.o: %.c
+--- cyphertite-2.0.2/cyphertite/examples/ct_delete/GNUmakefile
++++ cyphertite-2.0.2/cyphertite/examples/ct_delete/GNUmakefile
+@@ -71,7 +71,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(BIN.NAME): $(BIN.OBJS)
+-	$(CC) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
++	$(CC) $(CFLAGS) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
+ 
+ 
+ $(OBJPREFIX)%.o: %.c
+--- cyphertite-2.0.2/cyphertite/examples/ct_exists/GNUmakefile
++++ cyphertite-2.0.2/cyphertite/examples/ct_exists/GNUmakefile
+@@ -71,7 +71,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(BIN.NAME): $(BIN.OBJS)
+-	$(CC) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
++	$(CC) $(CFLAGS) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
+ 
+ 
+ $(OBJPREFIX)%.o: %.c
+--- cyphertite-2.0.2/cyphertite/examples/ct_extract/GNUmakefile
++++ cyphertite-2.0.2/cyphertite/examples/ct_extract/GNUmakefile
+@@ -71,7 +71,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(BIN.NAME): $(BIN.OBJS)
+-	$(CC) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
++	$(CC) $(CFLAGS) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
+ 
+ 
+ $(OBJPREFIX)%.o: %.c
+--- cyphertite-2.0.2/cyphertite/examples/ct_list/GNUmakefile
++++ cyphertite-2.0.2/cyphertite/examples/ct_list/GNUmakefile
+@@ -71,7 +71,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(BIN.NAME): $(BIN.OBJS)
+-	$(CC) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
++	$(CC) $(CFLAGS) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
+ 
+ 
+ $(OBJPREFIX)%.o: %.c
+--- cyphertite-2.0.2/cyphertite/cyphertite/GNUmakefile
++++ cyphertite-2.0.2/cyphertite/cyphertite/GNUmakefile
+@@ -75,7 +75,7 @@
+ 	-$(MKDIR) obj
+ 
+ $(OBJPREFIX)$(BIN.NAME): $(BIN.OBJS)
+-	$(CC) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
++	$(CC) $(CFLAGS) $(BIN.LDFLAGS) -o $@ $^ ${BIN.LDLIBS}
+ 
+ 
+ $(OBJPREFIX)%.o: %.c