Turn seds into patches. Respect CFLAGS (bug #241554), CC.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

5 files changed, 100 insertions, 3 deletions

diff --git a/x11-terms/xvt/ChangeLog b/x11-terms/xvt/ChangeLog
index b62666147f38..7e0cfea66219 100644
--- a/x11-terms/xvt/ChangeLog
+++ b/x11-terms/xvt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/xvt
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.14 2008/03/27 01:50:15 rbu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.15 2009/09/04 13:59:09 jer Exp $
+
+*xvt-2.1-r2 (04 Sep 2009)
+
+  04 Sep 2009; Jeroen Roovers <jer@gentoo.org> +xvt-2.1-r2.ebuild,
+  +files/xvt-int-main.patch, +files/xvt-makefile.patch:
+  Turn seds into patches. Respect CFLAGS (bug #241554), CC.
 
   27 Mar 2008; Robert Buchholz <rbu@gentoo.org> xvt-2.1-r1.ebuild:
   adding ~amd64
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
index c2e9f340120b..a7aeb9245f06 100644
--- a/x11-terms/xvt/Manifest
+++ b/x11-terms/xvt/Manifest
@@ -1,6 +1,9 @@
+AUX xvt-int-main.patch 458 RMD160 c2aa72f01a03e7be5d4ce0f2514233870c78b95c SHA1 249cba335d1924cc9faf61f0a9c2e221eb617b02 SHA256 11e20ebf19b334ae4e1237147c56298ce6b6995a30de0dcd5695c435fc75d716
+AUX xvt-makefile.patch 583 RMD160 644f7260a4705711eb9b75cb69096c385923ba9e SHA1 f95497f9f532551357026aaaa5d170a4779e5177 SHA256 b5dcc3f2806d85085e215a844624b099bbf3f94b8bc8ba5defbf1c61f4e82992
 AUX xvt-ttyinit-svr4pty.diff 1380 RMD160 b120ebf9fe518596af5ac13c1e89f629e4d69b95 SHA1 c168c17923048300ceec7b362c815d2ba1de443f SHA256 9723dce5d6609a8fddaed166bf6143faeb1b84765bdd7818b4eec33bb8d2371c
 DIST xvt-1.0.tar.Z 59445 RMD160 56fa0c779d178eccb222cd2d138d6fc4a18b800b SHA1 e8f616963f415c78a702938c9b03352714f4261a SHA256 399013beff538467a307d8a5f132e47ea4f5e18d60aba62c4d438f3ae1f086a1
 DIST xvt-2.1.diff.gz 39941 RMD160 57c54e0fd200739c8c7bcfadc34cac5884b62606 SHA1 97bbf9d0ae61f36e508dc43d59f791d9f852b994 SHA256 c51e0b1ea281ce83138d6a3f724c21b65c6257cf5438d8d0d5c34a8006348607
 EBUILD xvt-2.1-r1.ebuild 1144 RMD160 4c97d51c34e5ed3e500f43f452ed1e7fa6dd876b SHA1 9f0883a68ed19bf14cde94c645e5d5790c371ca7 SHA256 3df0292c91633d09c22be4fb266daf8a04d2301fa6e6a0b5ebd53bb0fb1281d5
-MISC ChangeLog 1604 RMD160 2ce87c54a5e7c6341ab2620b12a164f63a9c2643 SHA1 6ed0e898a9e2548d5c0be8d129425e0416744d7c SHA256 539639e691e3e392c17b33344fdbd44d21b76d27f13f27e7586b4a78d5afac3c
+EBUILD xvt-2.1-r2.ebuild 1050 RMD160 c169de184f6504e99e7ff9bd23b2e340b504295a SHA1 e58c1657dda25ea9a6c63475dc5fff7d6030e5af SHA256 27857e35b95f0c3bb5503465bedc28cb19a611b0bb5c97b7e1ca12d93d2bb73f
+MISC ChangeLog 1815 RMD160 bf7eaf91d949e72688c9e60a364e28416a24571a SHA1 d69a954a1924e846575b84a94d037af838a62a98 SHA256 c65f2df60907f0426e4b5383d68cd5d9ca197ed12b55048bacce02d9aa45e969
 MISC metadata.xml 325 RMD160 210904d177e857b01ffa14d22c3e216163ce318e SHA1 e536a746094f69fb71c3a250a17846def97d77d2 SHA256 5db01b64ca4dbd394bc67d429a52d73f7ea87a925eda971bb6e9ea8bbc86db16
diff --git a/x11-terms/xvt/files/xvt-int-main.patch b/x11-terms/xvt/files/xvt-int-main.patch
new file mode 100644
index 000000000000..81baa76ce5e0
--- /dev/null
+++ b/x11-terms/xvt/files/xvt-int-main.patch
@@ -0,0 +1,23 @@
+--- xvt-1.0/xvt.c.orig	2009-09-04 15:49:13.000000000 +0200
++++ xvt-1.0/xvt.c	2009-09-04 15:49:13.000000000 +0200
+@@ -41,9 +41,9 @@
+ #endif /* UKC_LOCATIONS */
+ 
+ #ifdef __STDC__
+-void main(int,char **);
++int main(int,char **);
+ #else
+-void main();
++int main();
+ #endif
+ 
+ extern int debugging;
+@@ -67,7 +67,7 @@
+  *  master end of the pseudo-teletype pair with the command talking to
+  *  the slave.
+  */
+-void
++int
+ main(argc,argv)
+ int argc;
+ char **argv;
diff --git a/x11-terms/xvt/files/xvt-makefile.patch b/x11-terms/xvt/files/xvt-makefile.patch
new file mode 100644
index 000000000000..368fdeeb00be
--- /dev/null
+++ b/x11-terms/xvt/files/xvt-makefile.patch
@@ -0,0 +1,20 @@
+--- xvt-1.0/Makefile.orig	2009-09-04 15:45:08.000000000 +0200
++++ xvt-1.0/Makefile	2009-09-04 15:46:00.000000000 +0200
+@@ -27,7 +27,7 @@
+ #ARCH=AIX3
+ #ARCH=ULTRIX
+ #ARCH=HPUX
+-#ARCH=LINUX
++ARCH=LINUX
+ #
+ #
+ # If this line is uncommented then `Make config' will unclude several options
+@@ -107,7 +107,7 @@
+ OBJ=xvt.o xsetup.o command.o screen.o sbar.o ttyinit.o
+ SRC=xvt.c xsetup.c command.c screen.c sbar.c ttyinit.c
+ #
+-CFLAGS=-O $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH)
++CFLAGS+= $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH)
+ #
+ xvt: $(OBJ)
+ 	$(CC) $(LDFLAGS) -o xvt $(OBJ) $(LIB) -lX11
diff --git a/x11-terms/xvt/xvt-2.1-r2.ebuild b/x11-terms/xvt/xvt-2.1-r2.ebuild
new file mode 100644
index 000000000000..2d96bf3b4eb9
--- /dev/null
+++ b/x11-terms/xvt/xvt-2.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1-r2.ebuild,v 1.1 2009/09/04 13:59:09 jer Exp $
+
+EAPI="2"
+
+inherit ccc eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A tiny vt100 terminal emulator for X"
+HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README"
+SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z
+		mirror://gentoo/xvt-2.1.diff.gz"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+S=${WORKDIR}/${PN}-1.0
+
+src_prepare() {
+	# this brings the distribution upto version 2.1
+	epatch "${WORKDIR}"/xvt-2.1.diff
+
+	# fix #61393
+	epatch "${FILESDIR}/xvt-ttyinit-svr4pty.diff"
+
+	# CFLAGS, CC #241554
+	epatch "${FILESDIR}/xvt-makefile.patch"
+
+	# int main, not void main
+	epatch "${FILESDIR}/xvt-int-main.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin xvt || die "dobin failed"
+	doman xvt.1
+	dodoc README
+}