[gentoo-commits] dev/xmw:master commit in: sys-apps/xlsh/files/, sys-apps/xlsh/

["Michael Weber" <xmw@gentoo.org>]

commit:     aa3a72bb35ec261082851333a71fc7e8424dd174
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 21:22:23 2011 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 21:22:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=aa3a72bb

sys-apps/xlsh: upstream fixed makefile

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 62EEF090)

---
 sys-apps/xlsh/ChangeLog                 |    4 ++++
 sys-apps/xlsh/Manifest                  |   11 +++++------
 sys-apps/xlsh/files/xlsh-Makefile.patch |   11 -----------
 sys-apps/xlsh/xlsh-9999.ebuild          |    6 +-----
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/sys-apps/xlsh/ChangeLog b/sys-apps/xlsh/ChangeLog
index 0416997..b7b6e4b 100644
--- a/sys-apps/xlsh/ChangeLog
+++ b/sys-apps/xlsh/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Oct 2011; Michael Weber <xmw@gentoo.org> xlsh-9999.ebuild,
+  -files/xlsh-Makefile.patch:
+  upstream fixed makefile
+
 *xlsh-9999 (19 Oct 2011)
 
   19 Oct 2011; Michael Weber <xmw@gentoo.org> +xlsh-9999.ebuild,

diff --git a/sys-apps/xlsh/Manifest b/sys-apps/xlsh/Manifest
index 6cbe961..41e7d84 100644
--- a/sys-apps/xlsh/Manifest
+++ b/sys-apps/xlsh/Manifest
@@ -1,14 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xlsh-Makefile.patch 411 RMD160 7e394cb1edb26caae8383decd394183e21fd4aff SHA1 e1106756cc0d5f4b32b0dd844e02250b4f4526e6 SHA256 d4d78ae50eff038677f9f5094753015cc6e80ff3e25a65ac199b8ed60895ed0b
-EBUILD xlsh-9999.ebuild 678 RMD160 693fb871cbcc94afa2191afb24951aa55bb2da26 SHA1 e0f18e4bdde215f7228608276f27c63ba7886c3e SHA256 237b5695a3af0c3b4be0e1088e3f4b79915645b0a1dc8a1a0551fb17f28c026f
-MISC ChangeLog 268 RMD160 13c448137a614be52630f6f5232bf1010c8d26c6 SHA1 c3afff84bd1f886afa1cbb4c493f5a18fec24b98 SHA256 526745e06db355084094b3ec4479e96c9181096f79a4eca08e93dc63f24dc878
+EBUILD xlsh-9999.ebuild 602 RMD160 bf00a33e5b74fa5631a4c23ffeef254f700cda1c SHA1 cba2f53111cc7230ec7c64de89b905a73b248fa3 SHA256 617a0c90cf1ee64f14f3f0d5a8421218303fe67288b868cbe31411fe5c96fbb8
+MISC ChangeLog 389 RMD160 c440854f6df7657a35a287053863c201790f0596 SHA1 ef02d9ff566658b33b3fc561c4bf6e8f4b5ea3e6 SHA256 c71f7b8ba1e89a914f15cc3789a50bed810610bda36d5fdbb619b1cfad6ac2ad
 MISC metadata.xml 292 RMD160 b78eee99995501e763816d46f3041ec17fee47d4 SHA1 3b5a8b453ec919b75c4f0a640c346d6e5bac38a1 SHA256 d16958ae3113324ac81b95ddc5ba9eee623f31260907650e83cae1c7488f1c76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6fPsEACgkQknrdDGLu8JBhRQD8DPdWIMcWLmQywuq+zvKE11ou
-oEOaLfsgUmVZYdj+WHEA/2qzyCdvO6tMg1sLk4YY3cwxgZk0cQ5ZdVICQizv4KRV
-=8UTb
+iF4EAREIAAYFAk6fP48ACgkQknrdDGLu8JCIMQD+IndpN4OyLuUcBVw3ABx15RJT
+93wHMl6huaaDAg1Vdn4A/2+i+OgLlwX6L6TrOT7/ZUAE+TNqL1M4lsC1Eyieq6VH
+=LjPr
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/xlsh/files/xlsh-Makefile.patch b/sys-apps/xlsh/files/xlsh-Makefile.patch
deleted file mode 100644
index f8bbfe2..0000000
--- a/sys-apps/xlsh/files/xlsh-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2011-10-19 22:58:41.692800717 +0200
-+++ Makefile	2011-10-19 23:04:57.708099876 +0200
-@@ -56,7 +56,7 @@
- 	$(INSTALL_DATA) etc/Xresources $(DESTDIR)$(sysconfdir)/xlsh
- 
- installdirs:
--	$(INSTALL_DIR) $(DESTDIR)$(sbindir) $(DESTDIR)$(sysconfdir)/xlsh
-+	$(INSTALL_DIR) $(DESTDIR)$(sbindir) $(DESTDIR)$(sysconfdir)/xlsh $(DESTDIR)$(sysconfdir)/pam.d
- 
- uninstall:
- 	rm -f ${DESTDIR}$(sbindir)/xlsh

diff --git a/sys-apps/xlsh/xlsh-9999.ebuild b/sys-apps/xlsh/xlsh-9999.ebuild
index 2f941f2..7a1bdd6 100644
--- a/sys-apps/xlsh/xlsh-9999.ebuild
+++ b/sys-apps/xlsh/xlsh-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=3
 
 EGIT_REPO_URI="https://github.com/Nadrin/xlsh.git"
-inherit eutils git-2 pam toolchain-funcs
+inherit git-2 pam toolchain-funcs
 
 DESCRIPTION="eXtended Login Shell"
 HOMEPAGE="https://github.com/Nadrin/xlsh"
@@ -20,10 +20,6 @@ RDEPEND="sys-libs/pam
 	sys-libs/readline"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-Makefile.patch || die
-}
-
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
 }