Respecting LDFLAGS, 337689

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 92 insertions, 3 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/Manifest b/app-misc/splitvt/Manifest
index 9c3ea2ae9cb6..b70b9485d324 100644
--- a/app-misc/splitvt/Manifest
+++ b/app-misc/splitvt/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.6.6-ldflags.patch 1048 RMD160 051a20156acf4095c3a5eaac176bbf9dac81214a SHA1 211e8cb4dc59027bcdb653f0e726620be867b267 SHA256 7e10f795780db244f7283fea25d32ca1397bb0e526ba13bbf8b6623660319f67
 DIST splitvt-1.6.6.tar.gz 64797 RMD160 014a9990ef41414b8488e10c24354bfc9588c4f8 SHA1 8073f4998ae0d772deecc583b61ea7cb92f7186b SHA256 70a03afe3a43c7458c5fe0152c386f62669107e045b973aecc667259b1820937
 DIST splitvt_1.6.6-4.diff.gz 10911 RMD160 5f748d8cbd6a0d2a594ebfb07be30cf4d494fc98 SHA1 e520f52616177c37ea1713ffff3f998d8a671182 SHA256 987fd211755af843106379de5309e7a35a7a2a784ce0aca255a6bd8fa00d6a99
+DIST splitvt_1.6.6-7.diff.gz 11073 RMD160 e6abc940253dcaf8bb20849ec235cb0e164d3220 SHA1 6db1fae5a177a126e2f84426e0680113609f017c SHA256 083f6f3e0f35a10859270f29ca02605e04918bcd5bf2ad94d71f2b13283310e4
 EBUILD splitvt-1.6.6-r1.ebuild 1247 RMD160 38cf8bd96bb0580c16cc78cf5558bf15f42e1315 SHA1 9f3874856ef24a4b35149170a8f51eb984845b54 SHA256 40064dc55eeab726f919b03909c4d593d7617597ce19a43bd0f8ae5502d51080
-MISC ChangeLog 3344 RMD160 296504bbb823cd3409bc83f5079d3adf928fd045 SHA1 781f6667e7f0468eb791a2fdead343312312ee12 SHA256 a2c6f779be7ad0e0d1ade7e04e8e28fa9883d722dbbe1ef48b118bc747168838
+EBUILD splitvt-1.6.6-r2.ebuild 1345 RMD160 4b3eab1d9022e3fd30852ed6dc148dac0e363cd1 SHA1 9dd22cdf119ac3d1ce991921267581e91f669d39 SHA256 6343ac2fb671c8e145bb0e7251ddfb860b2e0b512f451508636a246571d8bb34
+MISC ChangeLog 3506 RMD160 1bf81ca9ada8468102ed2567456cd38ed1501f0f SHA1 9b005aec1a33448cea3ac10c1a965b5181c59f82 SHA256 24e1b75b07836f9fcf9487f55dea6dcfcdb81c1160692c4d467be404fd7d035d
 MISC metadata.xml 166 RMD160 122e578c52fe3661ff8b8f1f574d8651916e3bf5 SHA1 5eb96c1efa4708676adcd6cad061b22caf9bdfe5 SHA256 064eb80cc86913e2a47d1088f1b0ebd5b64b5dab1c73d38b8501cd77891cfbbf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyU5fYACgkQgAnW8HDreRZTMACgoGyG/UErqarlaSthZBQ9jUyv
+aA0AnijSUhn2kYGFBhOSVD8Nk8wzrbav
+=5kla
+-----END PGP SIGNATURE-----
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
+}