Respecting LDFLAGS, 337689

(Portage version: 2.2_rc83/cvs/Linux x86_64)

3 files changed, 78 insertions, 2 deletions

diff --git a/app-misc/splitvt/ChangeLog b/app-misc/splitvt/ChangeLog
index 4a9d3cbed213..368cbbb733bc 100644
--- a/app-misc/splitvt/ChangeLog
+++ b/app-misc/splitvt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/splitvt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/ChangeLog,v 1.25 2009/08/20 03:41:52 darkside Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/ChangeLog,v 1.26 2010/09/18 16:16:49 jlec Exp $
+
+*splitvt-1.6.6-r2 (18 Sep 2010)
+
+  18 Sep 2010; Justin Lecher <jlec@gentoo.org> +files/1.6.6-ldflags.patch,
+  +splitvt-1.6.6-r2.ebuild:
+  Respecting LDFLAGS, 337689
 
   20 Aug 2009; Jeremy Olexa <darkside@gentoo.org>
   -files/splitvt-1.6.5-gcc4.diff:
diff --git a/app-misc/splitvt/files/1.6.6-ldflags.patch b/app-misc/splitvt/files/1.6.6-ldflags.patch
new file mode 100644
index 000000000000..5a545ad98ee8
--- /dev/null
+++ b/app-misc/splitvt/files/1.6.6-ldflags.patch
@@ -0,0 +1,23 @@
+diff --git a/config.c b/config.c
+index 6e8b090..2f3c8dc 100644
+--- a/config.c
++++ b/config.c
+@@ -229,15 +229,15 @@ char *argv[];
+ 	}
+ 	fprintf(makefile, 
+ 		"PTYOPTS = -DPTYCHAR=$(PTYCHAR) -DHEXDIGIT=$(HEXDIGIT)\n");
+-	sprintf(line, "\nCFLAGS = -Wall %s $(PTYOPTS)\nLIBS = %s\n", cflags, ldflags);
++	sprintf(line, "\nCFLAGS = %s $(PTYOPTS)\nLIBS = %s\n", cflags, ldflags);
+ 	fprintf(makefile, "%s", line);
+ 	fprintf(makefile, "OBJS = splitvt.o misc.o utmp.o vt100.o videomem.o terminal.o vttest.o vtmouse.o \\\n");
+ 	fprintf(makefile, "       parserc.o lock.o cut-paste.o\n\n");
+ 	fprintf(makefile, "splitvt: $(OBJS)\n");
+ #if defined(linux) && !defined(DEBUG)
+-	fprintf(makefile, "\t$(CC) -o $@ $(OBJS) $(LIBS)\n");
++	fprintf(makefile, "\t$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)\n");
+ #else
+-	fprintf(makefile, "\t$(CC) -o $@ $(OBJS) $(LIBS)\n");
++	fprintf(makefile, "\t$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)\n");
+ #endif
+ 	fprintf(makefile, "\nclean: \n\trm -f *.o core \n");
+ 	fprintf(makefile, "\ndistclean: clean\n\trm -f splitvt Makefile\n");
diff --git a/app-misc/splitvt/splitvt-1.6.6-r2.ebuild b/app-misc/splitvt/splitvt-1.6.6-r2.ebuild
new file mode 100644
index 000000000000..2bfcc2e4e41d
--- /dev/null
+++ b/app-misc/splitvt/splitvt-1.6.6-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/splitvt-1.6.6-r2.ebuild,v 1.1 2010/09/18 16:16:49 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+MY_P="${P/-/_}"
+DEB_PL="7"
+
+DESCRIPTION="A program for splitting terminals into two shells"
+HOMEPAGE="http://www.devolution.com/~slouken/projects/splitvt"
+SRC_URI="
+	http://www.devolution.com/~slouken/projects/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/s/splitvt/${MY_P}-${DEB_PL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${MY_P}-${DEB_PL}.diff
+	epatch "${FILESDIR}"/${PV}-ldflags.patch
+	sed -i \
+		-e "s:/usr/local/bin:${D}/usr/bin:g" \
+		-e "s:/usr/local/man/:${D}/usr/share/man/:g" config.c || die
+}
+
+src_compile() {
+	# upstream has their own weirdo configure script...
+	./configure || die "configure failed"
+	sed -i -e "s:-O2:${CFLAGS}:" -e "s:^CC = gcc:CC = $(tc-getCC):" Makefile || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1/ || die
+	make install || die "make install failed"
+	fperms 755 /usr/bin/xsplitvt || die
+	dodoc ANNOUNCE BLURB CHANGES NOTES README TODO || die
+	doman splitvt.1 || die
+}