Revision bump to fix CFLAGS and deps as per bug 516498 and bug 516500

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

3 files changed, 26 insertions, 14 deletions

diff --git a/app-backup/cyphertite/ChangeLog b/app-backup/cyphertite/ChangeLog
index a38e2cacb6cb..e3b79ecd2a09 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.1 2014/06/26 00:56:07 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/cyphertite/ChangeLog,v 1.2 2014/07/06 15:49:17 grknight Exp $
+
+*cyphertite-2.0.2-r1 (06 Jul 2014)
+
+  06 Jul 2014; Brian Evans <grknight@gentoo.org> +cyphertite-2.0.2-r1.ebuild,
+  -cyphertite-2.0.2.ebuild, files/cyphertite-2.0.2-fix-build.patch:
+  Revision bump to fix CFLAGS and deps as per bug 516498 and bug 516500
 
 *cyphertite-2.0.2 (26 Jun 2014)
 
diff --git a/app-backup/cyphertite/cyphertite-2.0.2.ebuild b/app-backup/cyphertite/cyphertite-2.0.2-r1.ebuild
index 009c26deae76..2ed943b56f41 100644
--- a/app-backup/cyphertite/cyphertite-2.0.2.ebuild
+++ b/app-backup/cyphertite/cyphertite-2.0.2-r1.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.ebuild,v 1.1 2014/06/26 00:56:07 grknight Exp $
+# $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 $
 
 EAPI=5
 
@@ -12,17 +12,19 @@ SRC_URI="https://www.cyphertite.com/snapshots/source/${PV}/${PN}-full-${PV}.tar.
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE=""
 
 DEPEND="
-	>=dev-libs/openssl-1.0.1g
-	dev-libs/expat
-	>=dev-libs/lzo-2.0
-	sys-libs/zlib
-	dev-db/sqlite:3
-	dev-libs/libedit
-	>=net-misc/curl-7.15.1
-	dev-libs/libbsd
+	app-arch/xz-utils:0=
+	dev-db/sqlite:3=
+	>=dev-libs/openssl-1.0.1g:0=
+	dev-libs/expat:0=
+	dev-libs/libbsd:0=
+	dev-libs/libedit:0=
+	dev-libs/libevent:0=
+	>=dev-libs/lzo-2.0:2=
+	>=net-misc/curl-7.15.1:0=
+	sys-libs/zlib:0=
 "
 RDEPEND="${DEPEND}"
 
@@ -33,7 +35,7 @@ src_prepare() {
 
 src_compile() {
 	# Package has a home grown Makefile system. Make it work for Gentoo
-	emake INCDIR="${S}" WARNFLAGS="-Wall" DEBUG=$(usex debug -g '') CC=$(tc-getCC) \
+	emake INCDIR="${S}" WARNFLAGS="-Wall" OPTLEVEL="" DEBUG="" CC=$(tc-getCC) \
 		AR=$(tc-getAR) LOCALBASE="/usr" LIB.LINKSTATIC="" LIB.LINKDYNAMIC=""
 }
 
diff --git a/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch b/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch
index f46878d0398d..1862acc79269 100644
--- a/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch
+++ b/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch
@@ -111,7 +111,7 @@ diff -aurNw cyphertite-2.0.2/shrink/shrink/GNUmakefile cyphertite-2.0.2.new/shri
 diff -aurNw cyphertite-2.0.2/xmlsd/GNUmakefile cyphertite-2.0.2.new/xmlsd/GNUmakefile
 --- cyphertite-2.0.2/xmlsd/GNUmakefile	2014-04-07 20:07:06.000000000 -0400
 +++ cyphertite-2.0.2.new/xmlsd/GNUmakefile	2014-06-24 21:51:42.518905907 -0400
-@@ -41,7 +41,7 @@
+@@ -41,10 +41,10 @@
  
  # Compiler and linker flags.
  CPPFLAGS += -DNEED_LIBCLENS
@@ -119,7 +119,11 @@ diff -aurNw cyphertite-2.0.2/xmlsd/GNUmakefile cyphertite-2.0.2.new/xmlsd/GNUmak
 +INCFLAGS += -I$(INCDIR)/clens/include/clens
  WARNFLAGS ?= -Wall -Werror
  DEBUG += -g
- CFLAGS += $(INCFLAGS) $(WARNFLAGS) $(DEBUG) -O2
+-CFLAGS += $(INCFLAGS) $(WARNFLAGS) $(DEBUG) -O2
++CFLAGS += $(INCFLAGS) $(WARNFLAGS) $(DEBUG)
+ LDFLAGS +=
+ SHARED_OBJ_EXT ?= o
+ 
 diff -aurwN cyphertite-2.0.2/cyphertite/examples/ct_archive/GNUmakefile cyphertite-2.0.2.new/cyphertite/examples/ct_archive/GNUmakefile
 --- cyphertite-2.0.2/cyphertite/examples/ct_archive/GNUmakefile	2014-04-07 20:07:03.000000000 -0400
 +++ cyphertite-2.0.2.new/cyphertite/examples/ct_archive/GNUmakefile	2014-06-24 22:45:13.136091682 -0400