4 files changed, 77 insertions, 7 deletions
diff --git a/dev-util/trinity/ChangeLog b/dev-util/trinity/ChangeLog
index f5a2dce4b698..1f04e44b3d76 100644
--- a/dev-util/trinity/ChangeLog
+++ b/dev-util/trinity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/trinity
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/ChangeLog,v 1.7 2013/12/22 02:19:07 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/ChangeLog,v 1.8 2014/06/25 04:57:32 radhermit Exp $
+
+*trinity-1.4 (25 Jun 2014)
+
+  25 Jun 2014; Tim Harder <radhermit@gentoo.org> +trinity-1.4.ebuild,
+  trinity-9999.ebuild, +files/trinity-1.4-flags.patch:
+  Version bump.
 
 *trinity-1.3 (22 Dec 2013)
 
diff --git a/dev-util/trinity/files/trinity-1.4-flags.patch b/dev-util/trinity/files/trinity-1.4-flags.patch
new file mode 100644
index 000000000000..5b639598044a
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.4-flags.patch
@@ -0,0 +1,20 @@
+--- trinity-1.4/Makefile
++++ trinity-1.4/Makefile
+@@ -9,7 +9,7 @@
+ CC := $(CROSS_COMPILE)$(CC)
+ LD := $(CROSS_COMPILE)$(LD)
+ 
+-CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
++CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
+ ifneq ($(SYSROOT),)
+ CFLAGS += --sysroot=$(SYSROOT)
+ endif
+@@ -84,7 +84,7 @@
+ df = $(DEPDIR)/$(*D)/$(*F)
+ 
+ %.o : %.c
+-	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
++	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $<
+ 	@mkdir -p $(DEPDIR)/$(*D)
+ 	@$(CC) -MM $(CFLAGS) $*.c > $(df).d
+ 	@mv -f $(df).d $(df).d.tmp
diff --git a/dev-util/trinity/trinity-1.4.ebuild b/dev-util/trinity/trinity-1.4.ebuild
new file mode 100644
index 000000000000..cf06435b6533
--- /dev/null
+++ b/dev-util/trinity/trinity-1.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/trinity-1.4.ebuild,v 1.1 2014/06/25 04:57:32 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	app-arch/xz-utils
+	sys-kernel/linux-headers
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/scripts
+		doexe scripts/*
+		docompress -x /usr/share/doc/${PF}/scripts
+	fi
+}
diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild
index 3a5fadd23562..c2c84116a7cf 100644
--- a/dev-util/trinity/trinity-9999.ebuild
+++ b/dev-util/trinity/trinity-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/trinity-9999.ebuild,v 1.4 2013/12/22 02:19:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/trinity-9999.ebuild,v 1.5 2014/06/25 04:57:32 radhermit Exp $
 
 EAPI=5
 
@@ -18,10 +18,9 @@ IUSE="examples"
 DEPEND="sys-kernel/linux-headers"
 
 src_prepare() {
-	sed -e 's/^CFLAGS := /CFLAGS +=/' \
-		-e 's/-g -O2//' \
+	sed -e 's/-g -O2//' \
 		-e 's/-D_FORTIFY_SOURCE=2//' \
-		-e '/-o trinity/s/$(CFLAGS)/\0 $(LDFLAGS)/' \
+		-e '/-o $@/s/$(LDFLAGS) //' \
 		-i Makefile || die
 
 	tc-export CC