From d5e69c1153e27a2a560b04d6dfb21e097d0691d3 Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Fri, 21 Oct 2011 16:45:09 +0000 Subject: [PATCH] Migrate changes from Gentoo Prefix overlay, KEYWORDS, EPREFIX and ED Package-Manager: portage-2.1.10.30/cvs/Linux x86_64 --- x11-terms/xterm/ChangeLog | 5 ++++- x11-terms/xterm/Manifest | 18 ++---------------- x11-terms/xterm/xterm-276.ebuild | 12 ++++++------ 3 files changed, 12 insertions(+), 23 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 xterm-276.ebuild: + Migrate changes from Gentoo Prefix overlay, KEYWORDS, EPREFIX and ED *xterm-276 (14 Oct 2011) diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest index 41992d780650..669dfd6911ec 100644 --- a/x11-terms/xterm/Manifest +++ b/x11-terms/xterm/Manifest @@ -1,22 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST xterm-271.tgz 973266 RMD160 85cd00657a25d392f2e2903d16dd606d4b90c6d6 SHA1 53586916147cb88e71b3d620a7d1b80f1696749b SHA256 e9baf3f36e1eb0da7b7b46ebe4fad3fa79f71e83885d77621de969888cc41f11 DIST xterm-275.tgz 983775 RMD160 0758ad39de0b81dfea2b1c6943324b78ed21d094 SHA1 068f425eec4d7a1d4fffa86b1f572315a76213dd SHA256 82e48bc67105666e05dbd7e31c97f90fa03e6b9124ce055d6170bde7e193c767 DIST xterm-276.tgz 984475 RMD160 c79d22dead614db337fbd26748c29fabc268e157 SHA1 d157204dff2462a823b5e6fae6fc22cb99ec6339 SHA256 ebb0fc38e1d6dfd7ed4e31cbb82e5d3a87a56da5c59d88980e89eef18b0073cc EBUILD xterm-271.ebuild 2162 RMD160 8d913ab9622298e88472dba955bac8b2fd35cd5e SHA1 b8bd0eb35eb0e83a75dea3ee01deb47cbea42a99 SHA256 24bdbb9ee342ca3c3b894733bd1978a653d043f02cfe322906ecea7d2b32b0de EBUILD xterm-275.ebuild 2203 RMD160 de8a1864cdedc0fa1c6ff59c9f3c3e89437194f2 SHA1 0b9347b12332705bdf12c341cc1b4f437f396924 SHA256 4a8b864ec29c7247ab5127179699c4446e2ed2913e7ebba99201187e390a9863 -EBUILD xterm-276.ebuild 2203 RMD160 e88341f6269fc004ee057f34f2a459e7917e59b0 SHA1 34d5fe0328603919f7b539e582f4e112555be008 SHA256 3e64de8b4220e3deec27ddfe9c8cab082c611382e33d7b1f1f428fdc88f9deab -MISC ChangeLog 43604 RMD160 592ff95395d51a3c017a8923c6c6c4a1f32a414b SHA1 5e4a21cef4a405c72f5a23f1f142d767c607e12d SHA256 c6da2909598fc1600b5733177e6769403c69adaf13a098a0cd6f4fdd497ca967 +EBUILD xterm-276.ebuild 2362 RMD160 53a41e47071bfb324b0d75a737ec264a8110efcd SHA1 fc2cbf6153ed4eeeb6bd7f93f4ebb3120ddc4c9c SHA256 1cd7271663db2a248b2bea04d3c258d99e4de5df7c38fd84c018b49f27037ffa +MISC ChangeLog 43743 RMD160 8241c56ab43ca6873a492c476dfcae1bfd55ac7f SHA1 d6336f3b90b21c3f721bbafd84036713fcf1f296 SHA256 c392b394981785257cf8992ba78c20eeb3799f3e8fd7f2a17be90ba1ebf92641 MISC metadata.xml 331 RMD160 32427445a48d438536862ab23680a3012a4ec123 SHA1 257df7d2ad3e04551657f215f71806af3df08501 SHA256 c2fa4045bcc7f1e04dc187c7a17e0a35e4b2e6aa058a5b139dae3e9529fcbff7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iQEcBAEBAgAGBQJOmKFeAAoJEEdUh39IaPFNuu0H/idpDhiPNgZxzLW/mARYDc76 -FXZ1A3C0vmQrqjyzTsSEUh189U1FsU+/cH/Um1bryd81I4q+IXnDiLmCIDzLwgln -L9kyBVTkQQbXcC0pAk0Z8ZfB/T6but6O2nu+QKuxVrwmCEbmVYsdL+z1+Xc8/4PU -BPROHtokmjT4nTADCik5uoByVNVaBwViTLreeHOfkeQs5Wk1DmqHFUDgPBIxXBwH -wYFeITfNhdTPyAAUCYfHp3dLIcDnjrI1fhQ5nG/A4U0e9nkjyDrGGICQvb03z0zn -QBtQoed+M5LkZ6uSYtFuISgcV+/39JQoAJTfJePJ72ZjfSLbUCtCEjlDyD0Lle0= -=HY9O ------END PGP SIGNATURE----- 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 } -- 2.26.2