summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2011-10-21 16:45:09 +0000
committerJeremy Olexa <darkside@gentoo.org>2011-10-21 16:45:09 +0000
commitf4eb26613ead6b237d6921d6d5b05e72b8937325 (patch)
tree1fd67f08add8f832c83dbed35c145e6294fe1a86 /x11-terms/xterm
parentold (diff)
downloadgentoo-2-f4eb26613ead6b237d6921d6d5b05e72b8937325.tar.gz
gentoo-2-f4eb26613ead6b237d6921d6d5b05e72b8937325.tar.bz2
gentoo-2-f4eb26613ead6b237d6921d6d5b05e72b8937325.zip
Migrate changes from Gentoo Prefix overlay, KEYWORDS, EPREFIX and ED
(Portage version: 2.1.10.30/cvs/Linux x86_64)
Diffstat (limited to 'x11-terms/xterm')
-rw-r--r--x11-terms/xterm/ChangeLog5
-rw-r--r--x11-terms/xterm/xterm-276.ebuild12
2 files changed, 10 insertions, 7 deletions
diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 6dcd384f8b83..051c50c2d872 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-terms/xterm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.339 2011/10/14 20:53:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.340 2011/10/21 16:45:09 darkside Exp $
+
+ 21 Oct 2011; Jeremy Olexa <darkside@gentoo.org> xterm-276.ebuild:
+ Migrate changes from Gentoo Prefix overlay, KEYWORDS, EPREFIX and ED
*xterm-276 (14 Oct 2011)
diff --git a/x11-terms/xterm/xterm-276.ebuild b/x11-terms/xterm/xterm-276.ebuild
index ec445367de4b..d4de7725e9c6 100644
--- a/x11-terms/xterm/xterm-276.ebuild
+++ b/x11-terms/xterm/xterm-276.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-276.ebuild,v 1.1 2011/10/14 20:53:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-276.ebuild,v 1.2 2011/10/21 16:45:09 darkside Exp $
EAPI=4
inherit eutils multilib
@@ -11,10 +11,10 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="toolbar truetype unicode Xaw3d"
-COMMON_DEPEND="sys-libs/libutempter
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
>=sys-libs/ncurses-5.6-r2
x11-apps/xmessage
x11-libs/libX11
@@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto"
pkg_setup() {
- DEFAULTS_DIR=/usr/share/X11/app-defaults
+ DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
}
src_configure() {
@@ -43,7 +43,7 @@ src_configure() {
# -ssuominen, 2011
econf \
- --libdir=/etc \
+ --libdir="${EPREFIX}"/etc \
--disable-full-tgetent \
--with-app-defaults=${DEFAULTS_DIR} \
--disable-setuid \
@@ -81,5 +81,5 @@ src_install() {
fperms 0755 /usr/bin/xterm
# restore the navy blue
- sed -i -e "s:blue2$:blue:" "${D}"${DEFAULTS_DIR}/XTerm-color
+ sed -i -e "s:blue2$:blue:" "${ED}"${DEFAULTS_DIR}/XTerm-color
}