x11-terms/xterm: Add Workaround for ncurses[tinfo], #454736; correct HOMEPAGE; improve usage of EAPI >=4; add missing die

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 39 insertions, 18 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index f4e33d50b49e..c6d52abfc263 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.378 2013/01/09 16:23:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.379 2013/02/14 13:42:55 jlec Exp $
+
+  14 Feb 2013; Justin Lecher <jlec@gentoo.org> xterm-285.ebuild,
+  xterm-288.ebuild, metadata.xml:
+  Add Workaround for ncurses[tinfo], #454736; correct HOMEPAGE; improve usage
+  of EAPI >=4; add missing die
 
   09 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> -xterm-279.ebuild,
   -xterm-281.ebuild, -xterm-287.ebuild:
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index 41d9d8f44668..0ca03ad78a0e 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>dickey@radix.net</email>
-		<name>Thomas Dickey</name>
-	</maintainer>
-	<herd>x11</herd>
-	<use>
-		<flag name='toolbar'>Enable the xterm toolbar to be built</flag>
-	</use>
+  <maintainer>
+    <email>dickey@radix.net</email>
+    <name>Thomas Dickey</name>
+  </maintainer>
+  <herd>x11</herd>
+  <use>
+    <flag name="toolbar">Enable the xterm toolbar to be built</flag>
+  </use>
 </pkgmetadata>
diff --git a/x11-terms/xterm/xterm-285.ebuild b/x11-terms/xterm/xterm-285.ebuild
index 86c517945e35..099b6e5e7771 100644
--- a/x11-terms/xterm/xterm-285.ebuild
+++ b/x11-terms/xterm/xterm-285.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-285.ebuild,v 1.11 2013/01/04 18:04:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-285.ebuild,v 1.12 2013/02/14 13:42:55 jlec Exp $
 
 EAPI=4
-inherit eutils multilib
+
+inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="http://dickey.his.com/xterm/"
+HOMEPAGE="http://invisible-island.net/xterm/"
 SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
@@ -43,6 +44,12 @@ src_configure() {
 	# --x-libraries="${ROOT}usr/$(get_libdir)"
 	# -ssuominen, 2011
 
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
 	econf \
 		--libdir="${EPREFIX}"/etc \
 		--disable-full-tgetent \
diff --git a/x11-terms/xterm/xterm-288.ebuild b/x11-terms/xterm/xterm-288.ebuild
index 79881ee12862..67fd0077ef82 100644
--- a/x11-terms/xterm/xterm-288.ebuild
+++ b/x11-terms/xterm/xterm-288.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-288.ebuild,v 1.1 2013/01/09 16:22:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-288.ebuild,v 1.2 2013/02/14 13:42:55 jlec Exp $
 
 EAPI=5
-inherit eutils multilib
+
+inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="http://dickey.his.com/xterm/"
+HOMEPAGE="http://invisible-island.net/xterm/"
 SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
@@ -34,11 +35,19 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/kbproto
 	x11-proto/xproto"
 
+DOCS=( README{,.i18n} ctlseqs.txt )
+
 pkg_setup() {
 	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
 }
 
 src_configure() {
+	# 454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $(pkg-config --libs ncurses)
+
 	econf \
 		--libdir="${EPREFIX}"/etc \
 		--disable-full-tgetent \
@@ -66,8 +75,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README{,.i18n} ctlseqs.txt
+	default
+
 	dohtml xterm.log.html
 	domenu *.desktop
 
@@ -78,5 +87,5 @@ src_install() {
 	fperms 0755 /usr/bin/xterm
 
 	# restore the navy blue
-	sed -i -e "s:blue2$:blue:" "${ED}${DEFAULTS_DIR}"/XTerm-color
+	sed -i -e "s:blue2$:blue:" "${ED}${DEFAULTS_DIR}"/XTerm-color || die
 }